分页查询Ecu出库库记录。
This commit is contained in:
parent
fcc8c54c10
commit
0ec8e431cc
@ -2,11 +2,9 @@ package com.cdzy.ebikeoperate.controller;
|
|||||||
|
|
||||||
import com.cdzy.common.model.JsonResult;
|
import com.cdzy.common.model.JsonResult;
|
||||||
import com.cdzy.ebikeoperate.mapper.EbikeEcuEnterRecordsMapper;
|
import com.cdzy.ebikeoperate.mapper.EbikeEcuEnterRecordsMapper;
|
||||||
import com.cdzy.ebikeoperate.model.dto.request.ReqComponentEnterRecordDto;
|
import com.cdzy.ebikeoperate.model.dto.request.*;
|
||||||
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.EbikeEcuEnterRecords;
|
||||||
|
import com.cdzy.ebikeoperate.model.pojo.EbikeEcuOutRecords;
|
||||||
import com.cdzy.ebikeoperate.model.pojo.EbikeHelmetEnterRecords;
|
import com.cdzy.ebikeoperate.model.pojo.EbikeHelmetEnterRecords;
|
||||||
import com.cdzy.ebikeoperate.service.EbikeBikeQrcodeService;
|
import com.cdzy.ebikeoperate.service.EbikeBikeQrcodeService;
|
||||||
import com.cdzy.ebikeoperate.service.EbikeComponentService;
|
import com.cdzy.ebikeoperate.service.EbikeComponentService;
|
||||||
@ -92,9 +90,21 @@ public class EbikeComponentController {
|
|||||||
* @param reqEbikeEcuEnterRecordsDto 分页查询条件
|
* @param reqEbikeEcuEnterRecordsDto 分页查询条件
|
||||||
* @return 分页对象
|
* @return 分页对象
|
||||||
*/
|
*/
|
||||||
@PostMapping("/ecuList")
|
@PostMapping("/ecuEnterList")
|
||||||
public JsonResult<?> ecuList(@RequestBody ReqEbikeEcuEnterRecordsDto reqEbikeEcuEnterRecordsDto) {
|
public JsonResult<?> ecuEnterList(@RequestBody ReqEbikeEcuEnterRecordsDto reqEbikeEcuEnterRecordsDto) {
|
||||||
Page<EbikeEcuEnterRecords> pageRecords = ebikeComponentService.getPageRecords(reqEbikeEcuEnterRecordsDto);
|
Page<EbikeEcuEnterRecords> pageRecords = ebikeComponentService.ecuEnterList(reqEbikeEcuEnterRecordsDto);
|
||||||
|
return JsonResult.success(pageRecords);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分页查询Ecu出库库记录。
|
||||||
|
*
|
||||||
|
* @param reqEbikeEcuOutRecordsDto 分页查询条件
|
||||||
|
* @return 分页对象
|
||||||
|
*/
|
||||||
|
@PostMapping("/ecuOutList")
|
||||||
|
public JsonResult<?> ecuEnterList(@RequestBody ReqEbikeEcuOutRecordsDto reqEbikeEcuOutRecordsDto) {
|
||||||
|
Page<EbikeEcuOutRecords> pageRecords = ebikeComponentService.ecuOutList(reqEbikeEcuOutRecordsDto);
|
||||||
return JsonResult.success(pageRecords);
|
return JsonResult.success(pageRecords);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -20,7 +20,6 @@ public class ReqEbikeEcuEnterRecordsDto {
|
|||||||
* 部件出库记录主键
|
* 部件出库记录主键
|
||||||
*/
|
*/
|
||||||
private String componentEnterRecordId;
|
private String componentEnterRecordId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页参数
|
* 分页参数
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -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;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@ -1,11 +1,9 @@
|
|||||||
package com.cdzy.ebikeoperate.service;
|
package com.cdzy.ebikeoperate.service;
|
||||||
|
|
||||||
import com.cdzy.common.model.JsonResult;
|
import com.cdzy.common.model.JsonResult;
|
||||||
import com.cdzy.ebikeoperate.model.dto.request.ReqComponentEnterRecordDto;
|
import com.cdzy.ebikeoperate.model.dto.request.*;
|
||||||
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.EbikeEcuEnterRecords;
|
||||||
|
import com.cdzy.ebikeoperate.model.pojo.EbikeEcuOutRecords;
|
||||||
import com.cdzy.ebikeoperate.model.pojo.EbikeHelmetEnterRecords;
|
import com.cdzy.ebikeoperate.model.pojo.EbikeHelmetEnterRecords;
|
||||||
import com.mybatisflex.core.paginate.Page;
|
import com.mybatisflex.core.paginate.Page;
|
||||||
import com.mybatisflex.core.service.IService;
|
import com.mybatisflex.core.service.IService;
|
||||||
@ -66,6 +64,14 @@ public interface EbikeComponentService {
|
|||||||
* @param reqEbikeEcuEnterRecordsDto 分页查询条件
|
* @param reqEbikeEcuEnterRecordsDto 分页查询条件
|
||||||
* @return 分页对象
|
* @return 分页对象
|
||||||
*/
|
*/
|
||||||
Page<EbikeEcuEnterRecords> getPageRecords(ReqEbikeEcuEnterRecordsDto reqEbikeEcuEnterRecordsDto);
|
Page<EbikeEcuEnterRecords> ecuEnterList(ReqEbikeEcuEnterRecordsDto reqEbikeEcuEnterRecordsDto);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分页查询Ecu出库库记录。
|
||||||
|
*
|
||||||
|
* @param reqEbikeEcuOutRecordsDto 分页查询条件
|
||||||
|
* @return 分页对象
|
||||||
|
*/
|
||||||
|
Page<EbikeEcuOutRecords> ecuOutList(ReqEbikeEcuOutRecordsDto reqEbikeEcuOutRecordsDto);
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -5,10 +5,7 @@ import com.cdzy.common.enums.Code;
|
|||||||
import com.cdzy.common.model.JsonResult;
|
import com.cdzy.common.model.JsonResult;
|
||||||
import com.cdzy.ebikeoperate.enums.ComponentType;
|
import com.cdzy.ebikeoperate.enums.ComponentType;
|
||||||
import com.cdzy.ebikeoperate.mapper.*;
|
import com.cdzy.ebikeoperate.mapper.*;
|
||||||
import com.cdzy.ebikeoperate.model.dto.request.ReqComponentEnterRecordDto;
|
import com.cdzy.ebikeoperate.model.dto.request.*;
|
||||||
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.model.pojo.*;
|
||||||
import com.cdzy.ebikeoperate.service.EbikeComponentService;
|
import com.cdzy.ebikeoperate.service.EbikeComponentService;
|
||||||
import com.ebike.feign.clients.StaffFeignClient;
|
import com.ebike.feign.clients.StaffFeignClient;
|
||||||
@ -24,6 +21,7 @@ import java.time.LocalDateTime;
|
|||||||
import java.util.List;
|
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.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;
|
import static com.cdzy.ebikeoperate.model.pojo.table.EbikeHelmetEnterRecordsTableDef.EBIKE_HELMET_ENTER_RECORDS;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -61,7 +59,6 @@ public class EbikeComponentServiceImpl implements EbikeComponentService {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private EbikeBatteryOutRecordsMapper ebikeBatteryOutRecordsMapper;
|
private EbikeBatteryOutRecordsMapper ebikeBatteryOutRecordsMapper;
|
||||||
|
|
||||||
|
|
||||||
public EbikeComponentServiceImpl(EbikeEcuEnterRecordsMapper ebikeEcuEnterRecordsMapper, EbikeComponentProductionMapper ebikeComponentProductionMapper) {
|
public EbikeComponentServiceImpl(EbikeEcuEnterRecordsMapper ebikeEcuEnterRecordsMapper, EbikeComponentProductionMapper ebikeComponentProductionMapper) {
|
||||||
this.ebikeEcuEnterRecordsMapper = ebikeEcuEnterRecordsMapper;
|
this.ebikeEcuEnterRecordsMapper = ebikeEcuEnterRecordsMapper;
|
||||||
this.ebikeComponentProductionMapper = ebikeComponentProductionMapper;
|
this.ebikeComponentProductionMapper = ebikeComponentProductionMapper;
|
||||||
@ -653,7 +650,7 @@ public class EbikeComponentServiceImpl implements EbikeComponentService {
|
|||||||
* @return 分页对象
|
* @return 分页对象
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Page<EbikeEcuEnterRecords> getPageRecords(ReqEbikeEcuEnterRecordsDto reqEbikeEcuEnterRecordsDto) {
|
public Page<EbikeEcuEnterRecords> ecuEnterList(ReqEbikeEcuEnterRecordsDto reqEbikeEcuEnterRecordsDto) {
|
||||||
QueryWrapper query = QueryWrapper.create();
|
QueryWrapper query = QueryWrapper.create();
|
||||||
String componentId = reqEbikeEcuEnterRecordsDto.getComponentEnterRecordId();
|
String componentId = reqEbikeEcuEnterRecordsDto.getComponentEnterRecordId();
|
||||||
if(componentId!=null&&!componentId.isEmpty())
|
if(componentId!=null&&!componentId.isEmpty())
|
||||||
@ -661,4 +658,21 @@ public class EbikeComponentServiceImpl implements EbikeComponentService {
|
|||||||
Page<EbikeEcuEnterRecords> page = reqEbikeEcuEnterRecordsDto.getPageParam().getPage();
|
Page<EbikeEcuEnterRecords> page = reqEbikeEcuEnterRecordsDto.getPageParam().getPage();
|
||||||
return ebikeEcuEnterRecordsMapper.paginate(page, query);
|
return ebikeEcuEnterRecordsMapper.paginate(page, query);
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* 分页查询Ecu出库库记录。
|
||||||
|
*
|
||||||
|
* @param reqEbikeEcuOutRecordsDto 分页查询条件
|
||||||
|
* @return 分页对象
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public Page<EbikeEcuOutRecords> 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<EbikeEcuOutRecords> page = reqEbikeEcuOutRecordsDto.getPageParam().getPage();
|
||||||
|
return ebikeEcuOutRecordsMapper.paginate(page, query);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user