From 0ec8e431ccfd4a831a6bdca55e426c683ac71638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=9C=B1?= <2671189764@qq.com> Date: Fri, 23 May 2025 17:29:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2Ecu?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=BA=93=E8=AE=B0=E5=BD=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EbikeComponentController.java | 24 ++++++++++----- .../request/ReqEbikeEcuEnterRecordsDto.java | 1 - .../dto/request/ReqEbikeEcuOutRecordsDto.java | 29 +++++++++++++++++++ .../service/EbikeComponentService.java | 16 ++++++---- .../impl/EbikeComponentServiceImpl.java | 26 +++++++++++++---- 5 files changed, 77 insertions(+), 19 deletions(-) create mode 100644 ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeEcuOutRecordsDto.java diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeComponentController.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeComponentController.java index 821cc9a7..a57581ed 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeComponentController.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeComponentController.java @@ -2,11 +2,9 @@ package com.cdzy.ebikeoperate.controller; import com.cdzy.common.model.JsonResult; import com.cdzy.ebikeoperate.mapper.EbikeEcuEnterRecordsMapper; -import com.cdzy.ebikeoperate.model.dto.request.ReqComponentEnterRecordDto; -import com.cdzy.ebikeoperate.model.dto.request.ReqComponentOutRecordDto; -import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeEcuEnterRecordsDto; -import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeHelmetEnterRecordsDto; +import com.cdzy.ebikeoperate.model.dto.request.*; import com.cdzy.ebikeoperate.model.pojo.EbikeEcuEnterRecords; +import com.cdzy.ebikeoperate.model.pojo.EbikeEcuOutRecords; import com.cdzy.ebikeoperate.model.pojo.EbikeHelmetEnterRecords; import com.cdzy.ebikeoperate.service.EbikeBikeQrcodeService; import com.cdzy.ebikeoperate.service.EbikeComponentService; @@ -92,9 +90,21 @@ public class EbikeComponentController { * @param reqEbikeEcuEnterRecordsDto 分页查询条件 * @return 分页对象 */ - @PostMapping("/ecuList") - public JsonResult ecuList(@RequestBody ReqEbikeEcuEnterRecordsDto reqEbikeEcuEnterRecordsDto) { - Page pageRecords = ebikeComponentService.getPageRecords(reqEbikeEcuEnterRecordsDto); + @PostMapping("/ecuEnterList") + public JsonResult ecuEnterList(@RequestBody ReqEbikeEcuEnterRecordsDto reqEbikeEcuEnterRecordsDto) { + Page pageRecords = ebikeComponentService.ecuEnterList(reqEbikeEcuEnterRecordsDto); + return JsonResult.success(pageRecords); + } + + /** + * 分页查询Ecu出库库记录。 + * + * @param reqEbikeEcuOutRecordsDto 分页查询条件 + * @return 分页对象 + */ + @PostMapping("/ecuOutList") + public JsonResult ecuEnterList(@RequestBody ReqEbikeEcuOutRecordsDto reqEbikeEcuOutRecordsDto) { + Page pageRecords = ebikeComponentService.ecuOutList(reqEbikeEcuOutRecordsDto); return JsonResult.success(pageRecords); } } diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeEcuEnterRecordsDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeEcuEnterRecordsDto.java index a725fcca..e42c854d 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeEcuEnterRecordsDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeEcuEnterRecordsDto.java @@ -20,7 +20,6 @@ public class ReqEbikeEcuEnterRecordsDto { * 部件出库记录主键 */ private String componentEnterRecordId; - /** * 分页参数 */ diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeEcuOutRecordsDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeEcuOutRecordsDto.java new file mode 100644 index 00000000..7f16db50 --- /dev/null +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeEcuOutRecordsDto.java @@ -0,0 +1,29 @@ +package com.cdzy.ebikeoperate.model.dto.request; + +import com.cdzy.common.model.PageParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + + /** + * Ecu出库记录查询请求 + * + * @author dingchao + * @date 2025/3/25 + * @modified by: + */ + @Data + @AllArgsConstructor + @NoArgsConstructor + public class ReqEbikeEcuOutRecordsDto { + /** + * 部件出库记录主键 + */ + private String componentOutRecordId; + /** + * 分页参数 + */ + private PageParam pageParam; + + } + diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeComponentService.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeComponentService.java index c0dc8f7f..b9475cbc 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeComponentService.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeComponentService.java @@ -1,11 +1,9 @@ package com.cdzy.ebikeoperate.service; import com.cdzy.common.model.JsonResult; -import com.cdzy.ebikeoperate.model.dto.request.ReqComponentEnterRecordDto; -import com.cdzy.ebikeoperate.model.dto.request.ReqComponentOutRecordDto; -import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeEcuEnterRecordsDto; -import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeHelmetEnterRecordsDto; +import com.cdzy.ebikeoperate.model.dto.request.*; import com.cdzy.ebikeoperate.model.pojo.EbikeEcuEnterRecords; +import com.cdzy.ebikeoperate.model.pojo.EbikeEcuOutRecords; import com.cdzy.ebikeoperate.model.pojo.EbikeHelmetEnterRecords; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; @@ -66,6 +64,14 @@ public interface EbikeComponentService { * @param reqEbikeEcuEnterRecordsDto 分页查询条件 * @return 分页对象 */ - Page getPageRecords(ReqEbikeEcuEnterRecordsDto reqEbikeEcuEnterRecordsDto); + Page ecuEnterList(ReqEbikeEcuEnterRecordsDto reqEbikeEcuEnterRecordsDto); + + /** + * 分页查询Ecu出库库记录。 + * + * @param reqEbikeEcuOutRecordsDto 分页查询条件 + * @return 分页对象 + */ + Page ecuOutList(ReqEbikeEcuOutRecordsDto reqEbikeEcuOutRecordsDto); } \ No newline at end of file diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeComponentServiceImpl.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeComponentServiceImpl.java index ee6ff3fd..08278a1b 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeComponentServiceImpl.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeComponentServiceImpl.java @@ -5,10 +5,7 @@ import com.cdzy.common.enums.Code; import com.cdzy.common.model.JsonResult; import com.cdzy.ebikeoperate.enums.ComponentType; import com.cdzy.ebikeoperate.mapper.*; -import com.cdzy.ebikeoperate.model.dto.request.ReqComponentEnterRecordDto; -import com.cdzy.ebikeoperate.model.dto.request.ReqComponentOutRecordDto; -import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeEcuEnterRecordsDto; -import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeHelmetEnterRecordsDto; +import com.cdzy.ebikeoperate.model.dto.request.*; import com.cdzy.ebikeoperate.model.pojo.*; import com.cdzy.ebikeoperate.service.EbikeComponentService; import com.ebike.feign.clients.StaffFeignClient; @@ -24,6 +21,7 @@ import java.time.LocalDateTime; import java.util.List; import static com.cdzy.ebikeoperate.model.pojo.table.EbikeEcuEnterRecordsTableDef.EBIKE_ECU_ENTER_RECORDS; +import static com.cdzy.ebikeoperate.model.pojo.table.EbikeEcuOutRecordsTableDef.EBIKE_ECU_OUT_RECORDS; import static com.cdzy.ebikeoperate.model.pojo.table.EbikeHelmetEnterRecordsTableDef.EBIKE_HELMET_ENTER_RECORDS; /** @@ -61,7 +59,6 @@ public class EbikeComponentServiceImpl implements EbikeComponentService { @Autowired private EbikeBatteryOutRecordsMapper ebikeBatteryOutRecordsMapper; - public EbikeComponentServiceImpl(EbikeEcuEnterRecordsMapper ebikeEcuEnterRecordsMapper, EbikeComponentProductionMapper ebikeComponentProductionMapper) { this.ebikeEcuEnterRecordsMapper = ebikeEcuEnterRecordsMapper; this.ebikeComponentProductionMapper = ebikeComponentProductionMapper; @@ -653,7 +650,7 @@ public class EbikeComponentServiceImpl implements EbikeComponentService { * @return 分页对象 */ @Override - public Page getPageRecords(ReqEbikeEcuEnterRecordsDto reqEbikeEcuEnterRecordsDto) { + public Page ecuEnterList(ReqEbikeEcuEnterRecordsDto reqEbikeEcuEnterRecordsDto) { QueryWrapper query = QueryWrapper.create(); String componentId = reqEbikeEcuEnterRecordsDto.getComponentEnterRecordId(); if(componentId!=null&&!componentId.isEmpty()) @@ -661,4 +658,21 @@ public class EbikeComponentServiceImpl implements EbikeComponentService { Page page = reqEbikeEcuEnterRecordsDto.getPageParam().getPage(); return ebikeEcuEnterRecordsMapper.paginate(page, query); } + /** + * 分页查询Ecu出库库记录。 + * + * @param reqEbikeEcuOutRecordsDto 分页查询条件 + * @return 分页对象 + */ + @Override + public Page ecuOutList(ReqEbikeEcuOutRecordsDto reqEbikeEcuOutRecordsDto) { + QueryWrapper query = QueryWrapper.create(); + String componentId = reqEbikeEcuOutRecordsDto.getComponentOutRecordId(); + if(componentId!=null&&!componentId.isEmpty()) + query.where(EBIKE_ECU_OUT_RECORDS.COMPONENT_OUT_RECORD_ID.eq(componentId)); + Page page = reqEbikeEcuOutRecordsDto.getPageParam().getPage(); + return ebikeEcuOutRecordsMapper.paginate(page, query); + } } + +