diff --git a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java index 08a73edd..e980e8e4 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java @@ -38,4 +38,56 @@ public class ReportDataController { return R.failed(e.getMessage()); } } + + /** + * 设备负荷率报表 + * 查询设备每日的负荷率 + * @param paramMap + * @return + */ + @GetMapping("/findResourceLoadRateInfo") + public R findResourceLoadRateInfo(@RequestParam(required = false) Map paramMap) { + try { + paramMap.put("site", CommonMethods.getSite()); + List> result = reportDataService.findResourceLoadRateInfo(paramMap); + return R.ok(result); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + } + + /** + * 设备维修数据统计报表 + * + * @param paramMap + * @return + */ + @GetMapping("/findResourceRepairDataStatInfo") + public R findResourceRepairDataStatInfo(@RequestParam(required = false) Map paramMap) { + try { + paramMap.put("site", CommonMethods.getSite()); + List> result = reportDataService.findResourceRepairDataStatInfo(paramMap); + return R.ok(result); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + } + + /** + * 每日生产状态报表 + * + * @param paramMap + * @return + */ + @GetMapping("/findProductStateInfo") + public R findProductStateInfo(@RequestParam(required = false) Map paramMap) { + try { + paramMap.put("site", CommonMethods.getSite()); + List> result = reportDataService.findProductStateInfo(paramMap); + return R.ok(result); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + } + } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java index a4d13aaa..a491333d 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java @@ -8,4 +8,14 @@ import java.util.Map; @Repository public interface ReportDataMapper { List> findInspectionTask(Map paramMap); + + + List> findResourceLoadRateInfo(Map paramMap); + + List> findResourceRepairDataStatInfo(Map paramMap); + + List> findProductStateInfo(Map paramMap); + + + } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java index 84d18732..a36334e4 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java @@ -11,4 +11,27 @@ public interface ReportDataService { * @return */ List> findInspectionTask(Map paramMap); + + /** + * 设备负荷率报表 + * + * @param paramMap + * @return + */ + List> findResourceLoadRateInfo(Map paramMap); + /** + * 设备维修数据统计报表 + * + * @param paramMap + * @return + */ + List> findResourceRepairDataStatInfo(Map paramMap); + /** + * 每日生产状态报表 + * + * @param paramMap + * @return + */ + List> findProductStateInfo(Map paramMap); + } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java index ffa1d225..216ac4fa 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java @@ -20,4 +20,19 @@ public class ReportDataServiceImpl implements ReportDataService{ public List> findInspectionTask(Map paramMap) { return reportDataMapper.findInspectionTask(paramMap); } + + @Override + public List> findResourceLoadRateInfo(Map paramMap) { + return reportDataMapper.findResourceLoadRateInfo(paramMap); + } + + @Override + public List> findResourceRepairDataStatInfo(Map paramMap) { + return reportDataMapper.findResourceRepairDataStatInfo(paramMap); + } + + @Override + public List> findProductStateInfo(Map paramMap) { + return reportDataMapper.findProductStateInfo(paramMap); + } } diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml index 973b39b0..8d20197d 100644 --- a/common/src/main/resources/mapper/ReportDataMapper.xml +++ b/common/src/main/resources/mapper/ReportDataMapper.xml @@ -49,4 +49,19 @@ + + + + + + + + + \ No newline at end of file