From f67fd4d91d80b4ab989c6707f3a6de9811762c27 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:08:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2Ecu?= =?UTF-8?q?=E5=85=A5=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 | 21 +++++++++++++++++++ .../service/EbikeComponentService.java | 13 ++++++++++++ .../impl/EbikeComponentServiceImpl.java | 21 +++++++++++++++++++ 3 files changed, 55 insertions(+) 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 7909df29..d35f2663 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 @@ -1,10 +1,16 @@ 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.pojo.EbikeEcuEnterRecords; +import com.cdzy.ebikeoperate.model.pojo.EbikeHelmetEnterRecords; import com.cdzy.ebikeoperate.service.EbikeBikeQrcodeService; import com.cdzy.ebikeoperate.service.EbikeComponentService; +import com.mybatisflex.core.paginate.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -19,6 +25,9 @@ public class EbikeComponentController { @Autowired EbikeComponentService ebikeComponentService; + @Autowired + private EbikeEcuEnterRecordsMapper ebikeEcuEnterRecordsMapper; + /** * 设备部件（入库，暂存） （stockInType 0或空 表示暂存，1 表示入库。 * @param params @@ -76,4 +85,16 @@ public class EbikeComponentController { public JsonResult invalidateOutDevicePart(@RequestParam(name="componentOutRecordId")String componentOutRecordId) { return ebikeComponentService.invalidateOutDevicePart(componentOutRecordId); } + + /** + * 分页查询Ecu入库记录。 + * + * @param reqEbikeEcuEnterRecordsDto 分页查询条件 + * @return 分页对象 + */ + @GetMapping("/ecuList") + public JsonResult ecuList(@RequestBody ReqEbikeEcuEnterRecordsDto reqEbikeEcuEnterRecordsDto) { + Page pageRecords = ebikeComponentService.getPageRecords(reqEbikeEcuEnterRecordsDto); + return JsonResult.success(pageRecords); + } } 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 04904505..c0dc8f7f 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 @@ -3,6 +3,11 @@ 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.pojo.EbikeEcuEnterRecords; +import com.cdzy.ebikeoperate.model.pojo.EbikeHelmetEnterRecords; +import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; import java.util.Map; @@ -55,4 +60,12 @@ public interface EbikeComponentService { * @return */ JsonResult invalidateOutDevicePart(String componentOutRecordId); + /** + * 分页查询Ecu入库记录。 + * + * @param reqEbikeEcuEnterRecordsDto 分页查询条件 + * @return 分页对象 + */ + Page getPageRecords(ReqEbikeEcuEnterRecordsDto reqEbikeEcuEnterRecordsDto); + } \ 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 2420a427..ee6ff3fd 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 @@ -7,10 +7,13 @@ 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.pojo.*; import com.cdzy.ebikeoperate.service.EbikeComponentService; import com.ebike.feign.clients.StaffFeignClient; import com.ebike.feign.model.rsp.StaffFeign; +import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import jakarta.annotation.Resource; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +23,9 @@ import org.springframework.transaction.annotation.Transactional; 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.EbikeHelmetEnterRecordsTableDef.EBIKE_HELMET_ENTER_RECORDS; + /** * 部件的相关接口实现 */ @@ -640,4 +646,19 @@ public class EbikeComponentServiceImpl implements EbikeComponentService { // 返回获取到的 StaffFeign 数据 return result.getData(); } + /** + * 分页查询Ecu入库记录。 + * + * @param reqEbikeEcuEnterRecordsDto 分页查询条件 + * @return 分页对象 + */ + @Override + public Page getPageRecords(ReqEbikeEcuEnterRecordsDto reqEbikeEcuEnterRecordsDto) { + QueryWrapper query = QueryWrapper.create(); + String componentId = reqEbikeEcuEnterRecordsDto.getComponentEnterRecordId(); + if(componentId!=null&&!componentId.isEmpty()) + query.where(EBIKE_ECU_ENTER_RECORDS.COMPONENT_ENTER_RECORD_ID.eq(componentId)); + Page page = reqEbikeEcuEnterRecordsDto.getPageParam().getPage(); + return ebikeEcuEnterRecordsMapper.paginate(page, query); + } }