diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/DashboardController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/DashboardController.java index 3730bd9..cbc0edb 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/DashboardController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/DashboardController.java @@ -22,15 +22,20 @@ import org.springframework.web.bind.annotation.RestController; public class DashboardController { private final DashboardServiceI dashboardService; + //统计当天的进出数量 人和车 @ApiOperation("可视化大屏-记录统计") @PostMapping("/recordStat") public SingleResponse recordStat(@RequestBody DashboardRecordStatCmd cmd) { return dashboardService.recordStat(cmd); } - + // 统计当天的口门进入进出记录数量,根据口门统计 @ApiOperation("可视化大屏-口门进入进出记录统计") @PostMapping("/mkmjRecord") public MultiResponse mkmjRecord(@RequestBody DashboardMkmjRecordCmd cmd) { return dashboardService.mkmjRecord(cmd); } + + //口门进出记录,人员通道和车辆通道 + + //一个或多个企业的,进入了,没有出去的车数量和人的数量 } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/DashboardQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/DashboardQueryExe.java index 99216ed..f035e1d 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/DashboardQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/DashboardQueryExe.java @@ -36,7 +36,7 @@ public class DashboardQueryExe { params.put("portArea", cmd.getPortArea()); DashboardRecordStatCO co = new DashboardRecordStatCO(); - // TODO 进出统计待后续接入 + // TODO 进出统计待后续接入,统计纬度是当天的数据 co.setOneLevelInoutPersonCount(0); co.setOneLevelInoutCarCount(0); co.setClosedAreaInoutPersonCount(0); diff --git a/web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml b/web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml index ee5167a..0235594 100644 --- a/web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml @@ -67,7 +67,9 @@ LEFT JOIN closed_area ca ON c.closed_area_id = ca.id AND ca.delete_enum = 'FALSE' LEFT JOIN corp_info ci ON ca.jurisdictional_corp_id = ci.id AND ci.delete_enum = 'FALSE' WHERE c.delete_enum = 'FALSE' - AND c.audit_flag = 1 + AND c.audit_flag IN (2, 3) + AND c.audit_time IS NOT NULL + AND DATE(c.audit_time) = CURDATE() AND ca.jurisdictional_corp_id = #{params.corpinfoId} diff --git a/web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml b/web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml index dd8f223..a9eed60 100644 --- a/web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml @@ -128,7 +128,9 @@ LEFT JOIN closed_area ca ON c.closed_area_id = ca.id AND ca.delete_enum = 'FALSE' LEFT JOIN corp_info ci ON ca.jurisdictional_corp_id = ci.id AND ci.delete_enum = 'FALSE' WHERE c.delete_enum = 'FALSE' - AND c.audit_flag = 1 + AND c.audit_flag IN (2, 3) + AND c.audit_time IS NOT NULL + AND DATE(c.audit_time) = CURDATE() AND ca.jurisdictional_corp_id = #{params.corpinfoId} diff --git a/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml b/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml index 8b7bf18..e917715 100644 --- a/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml @@ -11,7 +11,9 @@ LEFT JOIN xgf_apply_person xap ON pa.xgf_apply_person_id = xap.id AND xap.delete_enum = 'FALSE' LEFT JOIN corp_info ci ON xap.apply_corp_id = ci.id AND ci.delete_enum = 'FALSE' WHERE pa.delete_enum = 'FALSE' - AND xap.audit_flag = 1 + AND xap.audit_flag IN (2, 3) + AND xap.audit_time IS NOT NULL + AND DATE(xap.audit_time) = CURDATE() AND xap.apply_corp_id = #{params.corpinfoId} diff --git a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml index 448530b..7466948 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml @@ -94,11 +94,14 @@ order by f.id desc