diff --git a/start/src/main/resources/nacos.yml b/start/src/main/resources/nacos.yml index fc05ce3..6f6f0c8 100644 --- a/start/src/main/resources/nacos.yml +++ b/start/src/main/resources/nacos.yml @@ -6,6 +6,10 @@ application: version: gateway: primeport cn-name: 一级口门管理 +server: + port: 801 +debug: true + spring: application: name: ${application.name}${application.version} @@ -20,7 +24,7 @@ spring: file-extension: yml shared-configs: - config-common.yml - - config-port.yml +# - config-port.yml - config-mq.yml - config-log.yml - config-sdk-server.yml @@ -36,3 +40,4 @@ spring: discovery: server-addr: ${spring.cloud.nacos.config.server-addr} namespace: ${spring.cloud.nacos.config.namespace} + diff --git a/start/src/main/resources/nacos/config-port.yml b/start/src/main/resources/nacos/config-port.yml index 0255ab3..4ed22a4 100644 --- a/start/src/main/resources/nacos/config-port.yml +++ b/start/src/main/resources/nacos/config-port.yml @@ -1,3 +1,3 @@ server: - port: 80 -debug: true \ No newline at end of file + port: 801 +debug: true diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleViolationsController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleViolationsController.java index c1db8b1..723225f 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleViolationsController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleViolationsController.java @@ -10,6 +10,7 @@ import com.zcloud.primeport.dto.VehicleViolationsAddCmd; import com.zcloud.primeport.dto.VehicleViolationsPageQry; import com.zcloud.primeport.dto.VehicleViolationsUpdateCmd; import com.zcloud.primeport.dto.clientobject.VehicleViolationsCO; +import com.zcloud.primeport.dto.clientobject.VehicleViolationsListCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -24,7 +25,7 @@ import java.util.ArrayList; * @Author guoyuepeng * @Date 2025-11-21 16:34:29 */ -@Api(tags = "") +@Api(tags = "车辆违规记录") @RequestMapping("/${application.gateway}/vehicleViolations") @RestController @AllArgsConstructor @@ -43,13 +44,6 @@ public class VehicleViolationsController { public PageResponse page(@RequestBody VehicleViolationsPageQry qry) { return vehicleViolationsService.listPage(qry); } - - @ApiOperation("所有数据") - @GetMapping("/listAll") - public MultiResponse listAll() { - return MultiResponse.of(new ArrayList()); - } - @ApiOperation("详情") @GetMapping("/{id}") public SingleResponse getInfoById(@PathVariable("id") Long id) { @@ -63,18 +57,17 @@ public class VehicleViolationsController { return SingleResponse.buildSuccess(); } - @ApiOperation("删除多个") - @DeleteMapping("/ids") - public Response removeBatch(@RequestParam Long[] ids) { - vehicleViolationsService.removeBatch(ids); - return SingleResponse.buildSuccess(); - } - @ApiOperation("修改") @PutMapping("/edit") public SingleResponse edit(@Validated @RequestBody VehicleViolationsUpdateCmd vehicleViolationsUpdateCmd) { vehicleViolationsService.edit(vehicleViolationsUpdateCmd); return SingleResponse.buildSuccess(); } + + @ApiOperation("分页-和违规次数") + @PostMapping("/pageAncCount") + public PageResponse pageAncCount(@RequestBody VehicleViolationsPageQry qry) { + return vehicleViolationsService.listAndCountPage(qry); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java index 564224a..c3f25f6 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java @@ -1,6 +1,8 @@ package com.zcloud.primeport.command; import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.VehicleBlackGateway; import com.zcloud.primeport.domain.gateway.VehicleViolationsGateway; +import com.zcloud.primeport.domain.model.VehicleBlackE; import com.zcloud.primeport.domain.model.VehicleViolationsE; import com.zcloud.primeport.dto.VehicleViolationsAddCmd; import lombok.AllArgsConstructor; @@ -19,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional; @AllArgsConstructor public class VehicleViolationsAddExe { private final VehicleViolationsGateway vehicleViolationsGateway; + private final VehicleBlackGateway vehicleBlackGateway; @Transactional(rollbackFor = Exception.class) public boolean execute(VehicleViolationsAddCmd cmd) { @@ -27,6 +30,12 @@ public class VehicleViolationsAddExe { boolean res = false; try { res = vehicleViolationsGateway.add(vehicleViolationsE); + Long count = vehicleViolationsGateway.getCountByVehicleId(vehicleViolationsE.getVehicleId()); + if (count >= 5){ //如果超过5次违规,则加入黑名单 + VehicleBlackE vehicleBlackE = new VehicleBlackE(); + vehicleBlackE.setVehicleId(vehicleViolationsE.getVehicleId()); + res = vehicleBlackGateway.add(vehicleBlackE); + } } catch (Exception e) { throw new RuntimeException(e); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleViolationsCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleViolationsCoConvertor.java index 934f5f9..3b124b3 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleViolationsCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleViolationsCoConvertor.java @@ -1,6 +1,8 @@ package com.zcloud.primeport.command.convertor; import com.zcloud.primeport.dto.clientobject.VehicleViolationsCO; +import com.zcloud.primeport.dto.clientobject.VehicleViolationsListCO; +import com.zcloud.primeport.persistence.dataobject.VehicleCountFromViolationsDO; import com.zcloud.primeport.persistence.dataobject.VehicleViolationsDO; import org.mapstruct.Mapper; @@ -22,5 +24,9 @@ public interface VehicleViolationsCoConvertor { List converDOsToCOs(List vehicleViolationsDOs); VehicleViolationsCO converDOToCO(VehicleViolationsDO vehicleViolationsDO); + + + List converFromViolationsDOsToCOs(List vehicleViolationsDOs); + } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleViolationsQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleViolationsQueryExe.java index e037e5f..996da14 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleViolationsQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleViolationsQueryExe.java @@ -5,7 +5,10 @@ import com.alibaba.cola.dto.PageResponse; import com.zcloud.primeport.command.convertor.VehicleViolationsCoConvertor; import com.zcloud.primeport.dto.VehicleViolationsPageQry; import com.zcloud.primeport.dto.clientobject.VehicleViolationsCO; +import com.zcloud.primeport.dto.clientobject.VehicleViolationsListCO; +import com.zcloud.primeport.persistence.dataobject.VehicleCountFromViolationsDO; import com.zcloud.primeport.persistence.dataobject.VehicleViolationsDO; +import com.zcloud.primeport.persistence.repository.VehicleMessageRepository; import com.zcloud.primeport.persistence.repository.VehicleViolationsRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; @@ -25,7 +28,7 @@ import java.util.Map; public class VehicleViolationsQueryExe { private final VehicleViolationsRepository vehicleViolationsRepository; private final VehicleViolationsCoConvertor vehicleViolationsCoConvertor; - + private final VehicleMessageRepository vehicleMessageRepository; /** * 根据id查询 * @@ -48,5 +51,13 @@ public class VehicleViolationsQueryExe { List examCenterCOS = vehicleViolationsCoConvertor.converDOsToCOs(pageResponse.getData()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + + public PageResponse executeFromViolations(VehicleViolationsPageQry vehicleViolationsPageQry) { + Map params = PageQueryHelper.toHashMap(vehicleViolationsPageQry); + PageResponse pageResponse = vehicleMessageRepository.listPageFromViolations(params); + List examCenterCOS = vehicleViolationsCoConvertor.converFromViolationsDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/VehicleViolationsServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/VehicleViolationsServiceImpl.java index 8e432fb..5fe2ff0 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/VehicleViolationsServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/VehicleViolationsServiceImpl.java @@ -11,6 +11,7 @@ import com.zcloud.primeport.dto.VehicleViolationsAddCmd; import com.zcloud.primeport.dto.VehicleViolationsPageQry; import com.zcloud.primeport.dto.VehicleViolationsUpdateCmd; import com.zcloud.primeport.dto.clientobject.VehicleViolationsCO; +import com.zcloud.primeport.dto.clientobject.VehicleViolationsListCO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -60,5 +61,10 @@ public class VehicleViolationsServiceImpl implements VehicleViolationsServiceI { public void removeBatch(Long[] ids) { vehicleViolationsRemoveExe.execute(ids); } + + @Override + public PageResponse listAndCountPage(VehicleViolationsPageQry qry) { + return vehicleViolationsQueryExe.executeFromViolations(qry); + } } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/VehicleViolationsServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/VehicleViolationsServiceI.java index 88f5f12..893bad4 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/VehicleViolationsServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/VehicleViolationsServiceI.java @@ -6,6 +6,7 @@ import com.zcloud.primeport.dto.VehicleViolationsAddCmd; import com.zcloud.primeport.dto.VehicleViolationsPageQry; import com.zcloud.primeport.dto.VehicleViolationsUpdateCmd; import com.zcloud.primeport.dto.clientobject.VehicleViolationsCO; +import com.zcloud.primeport.dto.clientobject.VehicleViolationsListCO; /** * web-client @@ -25,5 +26,9 @@ public interface VehicleViolationsServiceI { void remove(Long id); void removeBatch(Long[] ids); + + + PageResponse listAndCountPage(VehicleViolationsPageQry qry); + } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsAddCmd.java index 7a4d7c9..10a268d 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsAddCmd.java @@ -24,7 +24,7 @@ import java.util.Date; @AllArgsConstructor public class VehicleViolationsAddCmd extends Command { @ApiModelProperty(value = "车辆信息表(t_vehicle_message)的主键id", name = "vehicleId", required = true) - @NotNull(message = "车辆信息表(t_vehicle_message)的主键id不能为空") + @NotNull(message = "车辆信息主键") private Long vehicleId; @ApiModelProperty(value = "违规类型(0-未按规定车道行驶,1-违规停车)", name = "violationType", required = true) diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleCountFromViolationsCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleCountFromViolationsCO.java new file mode 100644 index 0000000..4ecd937 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleCountFromViolationsCO.java @@ -0,0 +1,41 @@ +package com.zcloud.primeport.dto.clientobject; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * web-infrastructure + * + * @Author guoyuepeng + * @Date 2025-11-15 11:41:21 + */ +@Data +public class VehicleCountFromViolationsCO extends BaseDO { + + @ApiModelProperty(value = "id") + @TableId(type = IdType.ASSIGN_ID) + private Long id; + //业务id + @ApiModelProperty(value = "业务id") + private String vehicleMessageId; + //车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌 + @ApiModelProperty(value = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌") + private Integer licenceType; + //车牌号 + @ApiModelProperty(value = "车牌号") + private String licenceNo; + //车辆类型 + @ApiModelProperty(value = "车辆类型") + private String vehicleType; + @ApiModelProperty(value = "车辆类型-名字") + private String vehicleTypeName; + @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3:货运车辆,4:临时车辆") + private Integer vehicleBelongType; + @ApiModelProperty(value = "违规数量") + private String violationsCount; + +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleViolationsListCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleViolationsListCO.java new file mode 100644 index 0000000..d054c74 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleViolationsListCO.java @@ -0,0 +1,43 @@ +package com.zcloud.primeport.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.sql.Date; + + +/** + * web-client + * + * @Author guoyuepeng + * @Date 2025-11-21 16:34:28 + */ +@Data +public class VehicleViolationsListCO extends ClientObject { + @ApiModelProperty(value = "id") + @TableId(type = IdType.ASSIGN_ID) + private Long id; + //业务id + @ApiModelProperty(value = "业务id") + private String vehicleMessageId; + //车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌 + @ApiModelProperty(value = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌") + private Integer licenceType; + //车牌号 + @ApiModelProperty(value = "车牌号") + private String licenceNo; + //车辆类型 + @ApiModelProperty(value = "车辆类型") + private String vehicleType; + @ApiModelProperty(value = "车辆类型-名字") + private String vehicleTypeName; + @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3:货运车辆,4:临时车辆") + private Integer vehicleBelongType; + @ApiModelProperty(value = "违规数量") + private String violationsCount; +} + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleViolationsGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleViolationsGateway.java index efd707d..88816c8 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleViolationsGateway.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleViolationsGateway.java @@ -27,5 +27,12 @@ public interface VehicleViolationsGateway { Boolean deletedVehicleViolationsById(Long id); Boolean deletedVehicleViolationsByIds(Long[] id); + + /** + * 查询违规记录次数 + * @param vehicleId + * @return + */ + Long getCountByVehicleId(Long vehicleId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleViolationsGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleViolationsGatewayImpl.java index 05b341c..fa0073b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleViolationsGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleViolationsGatewayImpl.java @@ -1,6 +1,5 @@ package com.zcloud.primeport.gatewayimpl; -import com.zcloud.gbscommon.utils.Tools; import com.zcloud.primeport.domain.gateway.VehicleViolationsGateway; import com.zcloud.primeport.domain.model.VehicleViolationsE; import com.zcloud.primeport.persistence.dataobject.VehicleViolationsDO; @@ -40,12 +39,25 @@ public class VehicleViolationsGatewayImpl implements VehicleViolationsGateway { @Override public Boolean deletedVehicleViolationsById(Long id) { - return vehicleViolationsRepository.removeById(id); + VehicleViolationsDO d = new VehicleViolationsDO(); + d.setId(id); + d.setDeleteEnum("TRUE"); + boolean b = vehicleViolationsRepository.updateById(d); + return b; } @Override public Boolean deletedVehicleViolationsByIds(Long[] ids) { return vehicleViolationsRepository.removeByIds(Arrays.asList(ids)); } + + @Override + public Long getCountByVehicleId(Long vehicleId) { + long count = vehicleViolationsRepository.count( + vehicleViolationsRepository.lambdaQuery() + .eq(VehicleViolationsDO::getVehicleId, vehicleId) + ); + return count; + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleCountFromViolationsDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleCountFromViolationsDO.java new file mode 100644 index 0000000..570b268 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleCountFromViolationsDO.java @@ -0,0 +1,41 @@ +package com.zcloud.primeport.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * web-infrastructure + * + * @Author guoyuepeng + * @Date 2025-11-15 11:41:21 + */ +@Data +public class VehicleCountFromViolationsDO extends BaseDO { + + @ApiModelProperty(value = "id") + @TableId(type = IdType.ASSIGN_ID) + private Long id; + //业务id + @ApiModelProperty(value = "业务id") + private String vehicleMessageId; + //车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌 + @ApiModelProperty(value = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌") + private Integer licenceType; + //车牌号 + @ApiModelProperty(value = "车牌号") + private String licenceNo; + //车辆类型 + @ApiModelProperty(value = "车辆类型") + private String vehicleType; + @ApiModelProperty(value = "车辆类型-名字") + private String vehicleTypeName; + @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3:货运车辆,4:临时车辆") + private Integer vehicleBelongType; + @ApiModelProperty(value = "违规数量") + private String violationsCount; + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleMessageMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleMessageMapper.java index fec80b0..b91f4e9 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleMessageMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleMessageMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zcloud.primeport.persistence.dataobject.VehicleCountByCorpDO; +import com.zcloud.primeport.persistence.dataobject.VehicleCountFromViolationsDO; import com.zcloud.primeport.persistence.dataobject.VehicleMessageDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -19,5 +20,8 @@ import java.util.Map; public interface VehicleMessageMapper extends BaseMapper { IPage listCountFromCorp(Page> page, @Param("params") Map parmas); + + IPage listFroViolations(Page> page, @Param("params") Map parmas); + } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleMessageRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleMessageRepository.java index 75f12c6..1e44737 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleMessageRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleMessageRepository.java @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.repo.BaseRepository; import com.zcloud.primeport.persistence.dataobject.VehicleCountByCorpDO; +import com.zcloud.primeport.persistence.dataobject.VehicleCountFromViolationsDO; import com.zcloud.primeport.persistence.dataobject.VehicleMessageDO; import java.util.List; @@ -25,4 +26,6 @@ public interface VehicleMessageRepository extends BaseRepository listAll(Long [] ids); VehicleMessageDO getByLicenceNo(String licenceNo); + + PageResponse listPageFromViolations(Map parmas); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleMessageRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleMessageRepositoryImpl.java index 9f6ac93..3551305 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleMessageRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleMessageRepositoryImpl.java @@ -9,14 +9,13 @@ import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Query; import com.zcloud.primeport.persistence.dataobject.VehicleCountByCorpDO; +import com.zcloud.primeport.persistence.dataobject.VehicleCountFromViolationsDO; import com.zcloud.primeport.persistence.dataobject.VehicleMessageDO; import com.zcloud.primeport.persistence.mapper.VehicleMessageMapper; import com.zcloud.primeport.persistence.repository.VehicleMessageRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.Map; @@ -60,5 +59,16 @@ public class VehicleMessageRepositoryImpl extends BaseRepositoryImpl listPageFromViolations(Map parmas) { + Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()),Integer.parseInt(parmas.get("pageSize").toString())); + IPage iPage = vehicleMessageMapper.listFroViolations(page, parmas); + return PageHelper.pageToResponse(iPage, iPage.getRecords()); + } } diff --git a/web-infrastructure/src/main/resources/mapper/VehicleMessageMapper.xml b/web-infrastructure/src/main/resources/mapper/VehicleMessageMapper.xml index 593fcde..6796fb1 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleMessageMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleMessageMapper.xml @@ -15,5 +15,19 @@ 1=1 GROUP BY f.id + + + +