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 new file mode 100644 index 0000000..3730bd9 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/DashboardController.java @@ -0,0 +1,36 @@ +package com.zcloud.primeport.web; + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.api.DashboardServiceI; +import com.zcloud.primeport.dto.DashboardMkmjRecordCmd; +import com.zcloud.primeport.dto.DashboardRecordStatCmd; +import com.zcloud.primeport.dto.clientobject.DashboardMkmjRecordCO; +import com.zcloud.primeport.dto.clientobject.DashboardRecordStatCO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api(tags = "可视化大屏-信息统计") +@RequestMapping("/${application.gateway}/dashboard") +@RestController +@AllArgsConstructor +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/DaHuaPersonSyncExe.java b/web-app/src/main/java/com/zcloud/primeport/command/DaHuaPersonSyncExe.java index fad793b..59d3547 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/DaHuaPersonSyncExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/DaHuaPersonSyncExe.java @@ -1,6 +1,7 @@ package com.zcloud.primeport.command; import com.alibaba.cola.exception.BizException; +import com.zcloud.gbscommon.utils.Base64Util; import com.zcloud.primeport.domain.gateway.DaHuaGateway; import com.zcloud.primeport.domain.gateway.PersonApplyGateway; import com.zcloud.primeport.domain.model.DaHuaPersonSyncCmd; @@ -8,7 +9,9 @@ import com.zcloud.primeport.domain.model.PersonApplyE; import com.zcloud.primeport.domain.model.XgfApplyPersonE; import com.zcloud.primeport.dto.PersonApplyUpdateCmd; import jodd.util.Base64; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -19,8 +22,9 @@ import java.util.Map; /** * 相关方人员同步大华平台。 */ +@Slf4j @Component -@AllArgsConstructor +@RequiredArgsConstructor public class DaHuaPersonSyncExe { private static final int RELATED_PARTY = 3; @@ -28,6 +32,9 @@ public class DaHuaPersonSyncExe { private final DaHuaGateway daHuaGateway; private final PersonApplyGateway personApplyGateway; + @Value("${file.url:}") + private String fileUrl; + /** * 相关方人员审核通过后，按证件号判断新增或更新大华人员。 */ @@ -118,11 +125,46 @@ public class DaHuaPersonSyncExe { DaHuaPersonSyncCmd.PersonBiosignature face = new DaHuaPersonSyncCmd.PersonBiosignature(); face.setType(3); face.setIndex(1); - face.setPath(faceUrl); + // userFaceUrl 是文件服务器相对路径，读取图片并转换为 Base64 后交给大华网关。 + face.setBase64Data(resolveFaceBase64(faceUrl)); cmd.setPersonBiosignatures(Collections.singletonList(face)); return cmd; } + /** + * 根据文件服务地址读取相关方人员头像并转换为图片 Base64。 + * 大华人员接口的 path 必须是大华图片上传接口返回的 fileUrl，不能直接使用本系统路径。 + */ + private String resolveFaceBase64(String faceUrl) { + if (faceUrl == null || faceUrl.trim().isEmpty()) { + throw new BizException("相关方人员头像不能为空"); + } + if (fileUrl == null || fileUrl.trim().isEmpty()) { + throw new BizException("文件访问地址未配置"); + } + String baseUrl = fileUrl.trim(); + String relativePath = faceUrl.trim(); + String imageUrl = baseUrl.endsWith("/") + ? baseUrl + removeLeadingSlash(relativePath) + : baseUrl + "/" + removeLeadingSlash(relativePath); + try { + String faceBase64 = Base64Util.urlToBase64(imageUrl); + if (faceBase64 == null || faceBase64.trim().isEmpty()) { + throw new BizException("相关方人员头像转换失败"); + } + return faceBase64; + } catch (BizException e) { + throw e; + } catch (Exception e) { + log.error("获取相关方人员头像失败, imageUrl={}", imageUrl, e); + throw new BizException("获取相关方人员头像失败"); + } + } + + private String removeLeadingSlash(String path) { + return path.startsWith("/") ? path.substring(1) : path; + } + private String decodeUserCard(String userCard) { try { return Base64.decodeToString(userCard); 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 new file mode 100644 index 0000000..99216ed --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/DashboardQueryExe.java @@ -0,0 +1,69 @@ +package com.zcloud.primeport.command.query; + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.dto.DashboardMkmjRecordCmd; +import com.zcloud.primeport.dto.DashboardRecordStatCmd; +import com.zcloud.primeport.dto.clientobject.DashboardMkmjRecordCO; +import com.zcloud.primeport.dto.clientobject.DashboardRecordStatCO; +import com.zcloud.primeport.persistence.dataobject.MkmjDO; +import com.zcloud.primeport.persistence.repository.ClosedAreaCarApplyRepository; +import com.zcloud.primeport.persistence.repository.ClosedAreaPersonApplyRepository; +import com.zcloud.primeport.persistence.repository.MkmjRepository; +import com.zcloud.primeport.persistence.repository.PersonApplyRepository; +import com.zcloud.primeport.persistence.repository.VehicleApplyRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Component +@AllArgsConstructor +public class DashboardQueryExe { + private final PersonApplyRepository personApplyRepository; + private final VehicleApplyRepository vehicleApplyRepository; + private final ClosedAreaPersonApplyRepository closedAreaPersonApplyRepository; + private final ClosedAreaCarApplyRepository closedAreaCarApplyRepository; + private final MkmjRepository mkmjRepository; + + public SingleResponse recordStat(DashboardRecordStatCmd cmd) { + Map params = new HashMap<>(); + params.put("corpinfoId", cmd.getCorpinfoId()); + params.put("portArea", cmd.getPortArea()); + + DashboardRecordStatCO co = new DashboardRecordStatCO(); + // TODO 进出统计待后续接入 + co.setOneLevelInoutPersonCount(0); + co.setOneLevelInoutCarCount(0); + co.setClosedAreaInoutPersonCount(0); + co.setClosedAreaInoutCarCount(0); + co.setOneLevelApprovalPersonCount(personApplyRepository.countDashboardApproval(params)); + co.setOneLevelApprovalCarCount(vehicleApplyRepository.countDashboardApproval(params)); + co.setClosedAreaApprovalPersonCount(closedAreaPersonApplyRepository.countDashboardApproval(params)); + co.setClosedAreaApprovalCarCount(closedAreaCarApplyRepository.countDashboardApproval(params)); + return SingleResponse.of(co); + } + + public MultiResponse mkmjRecord(DashboardMkmjRecordCmd cmd) { + Map params = new HashMap<>(); + params.put("corpinfoId", cmd.getCorpinfoId()); + params.put("portArea", cmd.getPortArea()); + params.put("mkmjLevel", cmd.getMkmjLevel()); + params.put("mkmjType", cmd.getMkmjType()); + + List dataList = mkmjRepository.listDashboardRecord(params); + List result = new ArrayList<>(); + for (MkmjDO data : dataList) { + DashboardMkmjRecordCO co = new DashboardMkmjRecordCO(); + BeanUtils.copyProperties(data, co); + co.setInCount(0); + co.setOutCount(0); + result.add(co); + } + return MultiResponse.of(result); + } +} diff --git a/web-app/src/main/java/com/zcloud/primeport/service/DashboardServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/DashboardServiceImpl.java new file mode 100644 index 0000000..778d3bc --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/service/DashboardServiceImpl.java @@ -0,0 +1,28 @@ +package com.zcloud.primeport.service; + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.api.DashboardServiceI; +import com.zcloud.primeport.command.query.DashboardQueryExe; +import com.zcloud.primeport.dto.DashboardMkmjRecordCmd; +import com.zcloud.primeport.dto.DashboardRecordStatCmd; +import com.zcloud.primeport.dto.clientobject.DashboardMkmjRecordCO; +import com.zcloud.primeport.dto.clientobject.DashboardRecordStatCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@AllArgsConstructor +public class DashboardServiceImpl implements DashboardServiceI { + private final DashboardQueryExe dashboardQueryExe; + + @Override + public SingleResponse recordStat(DashboardRecordStatCmd cmd) { + return dashboardQueryExe.recordStat(cmd); + } + + @Override + public MultiResponse mkmjRecord(DashboardMkmjRecordCmd cmd) { + return dashboardQueryExe.mkmjRecord(cmd); + } +} diff --git a/web-client/src/main/java/com/zcloud/primeport/api/DashboardServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/DashboardServiceI.java new file mode 100644 index 0000000..65e9da1 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/api/DashboardServiceI.java @@ -0,0 +1,14 @@ +package com.zcloud.primeport.api; + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.dto.DashboardMkmjRecordCmd; +import com.zcloud.primeport.dto.DashboardRecordStatCmd; +import com.zcloud.primeport.dto.clientobject.DashboardMkmjRecordCO; +import com.zcloud.primeport.dto.clientobject.DashboardRecordStatCO; + +public interface DashboardServiceI { + SingleResponse recordStat(DashboardRecordStatCmd cmd); + + MultiResponse mkmjRecord(DashboardMkmjRecordCmd cmd); +} diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/DashboardMkmjRecordCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/DashboardMkmjRecordCmd.java new file mode 100644 index 0000000..de7abc4 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/DashboardMkmjRecordCmd.java @@ -0,0 +1,20 @@ +package com.zcloud.primeport.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class DashboardMkmjRecordCmd extends Command { + @ApiModelProperty(value = "企业id", name = "corpinfoId") + private Long corpinfoId; + + @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea") + private Integer portArea; + + @ApiModelProperty(value = "口门级别 1-一级 2-二级", name = "mkmjLevel") + private Integer mkmjLevel; + + @ApiModelProperty(value = "口门类型 1-人行 2-车行 3-综合", name = "mkmjType") + private String mkmjType; +} diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/DashboardRecordStatCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/DashboardRecordStatCmd.java new file mode 100644 index 0000000..cca8041 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/DashboardRecordStatCmd.java @@ -0,0 +1,14 @@ +package com.zcloud.primeport.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class DashboardRecordStatCmd extends Command { + @ApiModelProperty(value = "企业id", name = "corpinfoId") + private Long corpinfoId; + + @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea") + private Integer portArea; +} diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/DashboardMkmjRecordCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/DashboardMkmjRecordCO.java new file mode 100644 index 0000000..8417717 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/DashboardMkmjRecordCO.java @@ -0,0 +1,38 @@ +package com.zcloud.primeport.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class DashboardMkmjRecordCO extends ClientObject { + @ApiModelProperty(value = "口门id") + private Long id; + + @ApiModelProperty(value = "所属港区编码") + private String hgAuthArea; + + @ApiModelProperty(value = "所属港区名称") + private String hgAuthAreaName; + + @ApiModelProperty(value = "口门名称") + private String mkmjName; + + @ApiModelProperty(value = "口门级别") + private Integer mkmjLevel; + + @ApiModelProperty(value = "口门类型") + private String mkmjType; + + @ApiModelProperty(value = "口门类型名称") + private String mkmjTypeName; + + @ApiModelProperty(value = "管辖企业id") + private Long mkmjAreaJurisdictionalCorpId; + + @ApiModelProperty(value = "进入数量") + private Integer inCount; + + @ApiModelProperty(value = "进出数量") + private Integer outCount; +} diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/DashboardRecordStatCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/DashboardRecordStatCO.java new file mode 100644 index 0000000..f2d5df5 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/DashboardRecordStatCO.java @@ -0,0 +1,32 @@ +package com.zcloud.primeport.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class DashboardRecordStatCO extends ClientObject { + @ApiModelProperty(value = "一级口门进出统计-人") + private Integer oneLevelInoutPersonCount; + + @ApiModelProperty(value = "一级口门进出统计-车") + private Integer oneLevelInoutCarCount; + + @ApiModelProperty(value = "一级口门进出审批-人") + private Integer oneLevelApprovalPersonCount; + + @ApiModelProperty(value = "一级口门进出审批-车") + private Integer oneLevelApprovalCarCount; + + @ApiModelProperty(value = "封闭区域进出统计-人") + private Integer closedAreaInoutPersonCount; + + @ApiModelProperty(value = "封闭区域进出统计-车") + private Integer closedAreaInoutCarCount; + + @ApiModelProperty(value = "封闭区域进出审批-人") + private Integer closedAreaApprovalPersonCount; + + @ApiModelProperty(value = "封闭区域进出审批-车") + private Integer closedAreaApprovalCarCount; +} diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaCarApplyMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaCarApplyMapper.java index 1f27a9d..114ca27 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaCarApplyMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaCarApplyMapper.java @@ -27,6 +27,8 @@ public interface ClosedAreaCarApplyMapper extends BaseMapper listPage(Page> page, @Param("params") Map params, String menuPerms); + Integer countDashboardApproval(@Param("params") Map params); + IPage screenList(Page> page, @Param("params") Map params); List getFgsCarToDay(String licenceNo); diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaPersonApplyMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaPersonApplyMapper.java index fd4ac73..a28a5b8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaPersonApplyMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaPersonApplyMapper.java @@ -33,6 +33,8 @@ public interface ClosedAreaPersonApplyMapper extends BaseMapper screenList(Page> page, @Param("params") Map params); + Integer countDashboardApproval(@Param("params") Map params); + List getDockAuthInfoById(Long applyId); List deptList(); diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjMapper.java index 2221680..6c44fe3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjMapper.java @@ -28,5 +28,7 @@ public interface MkmjMapper extends BaseMapper { IPage listPage(Page> page, @Param("params") Map params, String menuPerms); List listStatistics(); + + List listDashboardRecord(@Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java index da32fc4..e302e6c 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java @@ -28,6 +28,8 @@ public interface PersonApplyMapper extends BaseMapper { IPage listPage(Page> page, @Param("params") Map params, String menuPerms); + Integer countDashboardApproval(@Param("params") Map params); + IPage xgfPersonPermissionsList(Page> page, @Param("params") Map params, String menuPerms); IPage xgfPersonnelVehicleManagementList(Page> page, Map params, String menuPerms); diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java index a1fd966..2e792a7 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java @@ -31,6 +31,8 @@ public interface VehicleApplyMapper extends BaseMapper { IPage listPage(Page> page, @Param("params") Map params, String menuPerms); + Integer countDashboardApproval(@Param("params") Map params); + IPage fgsCount(Page> page, @Param("params") HashMap qry); VehicleApplyDO getInfoById(Long id); diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaCarApplyRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaCarApplyRepository.java index 9bec18b..d1945e4 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaCarApplyRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaCarApplyRepository.java @@ -17,6 +17,8 @@ import java.util.Map; public interface ClosedAreaCarApplyRepository extends BaseRepository { PageResponse listPage(Map params); + Integer countDashboardApproval(Map params); + PageResponse screenList(Map params); List getFgsCarToDay(String licenceNo); diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaPersonApplyRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaPersonApplyRepository.java index a4024ac..c20c91d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaPersonApplyRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaPersonApplyRepository.java @@ -21,6 +21,8 @@ import java.util.Map; public interface ClosedAreaPersonApplyRepository extends BaseRepository { PageResponse listPage(Map params); + Integer countDashboardApproval(Map params); + List deptList(); PageResponse getCorpUserList(Map params); diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjRepository.java index f3beabd..0cba3af 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjRepository.java @@ -14,5 +14,7 @@ public interface MkmjRepository extends BaseRepository { Boolean checkName(String mkmjName, Long excludeId); List listStatistics(); + + List listDashboardRecord(Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java index fb06485..27e0a76 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java @@ -14,6 +14,8 @@ import java.util.Map; public interface PersonApplyRepository extends BaseRepository { PageResponse listPage(Map params); + Integer countDashboardApproval(Map params); + PageResponse xgfPersonPermissionsList(Map params); PageResponse xgfPersonnelVehicleManagementList(Map parmas); diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java index b26f35c..3e243e5 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java @@ -20,6 +20,8 @@ import java.util.Map; public interface VehicleApplyRepository extends BaseRepository { PageResponse listPage(Map params); + Integer countDashboardApproval(Map params); + PageResponse fgsCount(HashMap qry); diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaCarApplyRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaCarApplyRepositoryImpl.java index 780b6bb..d67753f 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaCarApplyRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaCarApplyRepositoryImpl.java @@ -41,6 +41,11 @@ public class ClosedAreaCarApplyRepositoryImpl extends BaseRepositoryImpl params) { + return closedAreaCarApplyMapper.countDashboardApproval(params); + } + @Override public PageResponse screenList(Map params) { Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()), diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaPersonApplyRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaPersonApplyRepositoryImpl.java index d3d01ab..3c35b04 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaPersonApplyRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaPersonApplyRepositoryImpl.java @@ -50,6 +50,11 @@ public class ClosedAreaPersonApplyRepositoryImpl extends BaseRepositoryImpl params) { + return closedAreaPersonApplyMapper.countDashboardApproval(params); + } + @Override public List deptList() { diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjRepositoryImpl.java index 8308193..a14920d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjRepositoryImpl.java @@ -51,6 +51,11 @@ public class MkmjRepositoryImpl extends BaseRepositoryImpl i public List listStatistics() { return mkmjMapper.listStatistics(); } + + @Override + public List listDashboardRecord(Map params) { + return mkmjMapper.listDashboardRecord(params); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonApplyRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonApplyRepositoryImpl.java index e236dc2..6343662 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonApplyRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonApplyRepositoryImpl.java @@ -44,6 +44,11 @@ public class PersonApplyRepositoryImpl extends BaseRepositoryImpl params) { + return personApplyMapper.countDashboardApproval(params); + } + @Override public PageResponse xgfPersonPermissionsList(Map params) { Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()) diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java index 02544f7..ca16dba 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java @@ -49,6 +49,11 @@ public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl params) { + return vehicleApplyMapper.countDashboardApproval(params); + } + @Override public PageResponse fgsCount(HashMap qry) { Page> page = new Page<>(Integer.parseInt(qry.get("pageIndex").toString()), diff --git a/web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml b/web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml index 8f4cb17..ee5167a 100644 --- a/web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml @@ -61,6 +61,20 @@ order by c.id desc + + + diff --git a/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml b/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml index e9b7fe0..8b7bf18 100644 --- a/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml @@ -5,6 +5,20 @@ + +