分页查询Ecu入库记录。
This commit is contained in:
parent
677aaeafd5
commit
f67fd4d91d
@ -1,10 +1,16 @@
|
|||||||
package com.cdzy.ebikeoperate.controller;
|
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.model.dto.request.ReqComponentEnterRecordDto;
|
import com.cdzy.ebikeoperate.model.dto.request.ReqComponentEnterRecordDto;
|
||||||
import com.cdzy.ebikeoperate.model.dto.request.ReqComponentOutRecordDto;
|
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.EbikeBikeQrcodeService;
|
||||||
import com.cdzy.ebikeoperate.service.EbikeComponentService;
|
import com.cdzy.ebikeoperate.service.EbikeComponentService;
|
||||||
|
import com.mybatisflex.core.paginate.Page;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
@ -19,6 +25,9 @@ public class EbikeComponentController {
|
|||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
EbikeComponentService ebikeComponentService;
|
EbikeComponentService ebikeComponentService;
|
||||||
|
@Autowired
|
||||||
|
private EbikeEcuEnterRecordsMapper ebikeEcuEnterRecordsMapper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 设备部件(入库,暂存) (stockInType 0或空 表示暂存,1 表示入库。
|
* 设备部件(入库,暂存) (stockInType 0或空 表示暂存,1 表示入库。
|
||||||
* @param params
|
* @param params
|
||||||
@ -76,4 +85,16 @@ public class EbikeComponentController {
|
|||||||
public JsonResult<?> invalidateOutDevicePart(@RequestParam(name="componentOutRecordId")String componentOutRecordId) {
|
public JsonResult<?> invalidateOutDevicePart(@RequestParam(name="componentOutRecordId")String componentOutRecordId) {
|
||||||
return ebikeComponentService.invalidateOutDevicePart(componentOutRecordId);
|
return ebikeComponentService.invalidateOutDevicePart(componentOutRecordId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分页查询Ecu入库记录。
|
||||||
|
*
|
||||||
|
* @param reqEbikeEcuEnterRecordsDto 分页查询条件
|
||||||
|
* @return 分页对象
|
||||||
|
*/
|
||||||
|
@GetMapping("/ecuList")
|
||||||
|
public JsonResult<?> ecuList(@RequestBody ReqEbikeEcuEnterRecordsDto reqEbikeEcuEnterRecordsDto) {
|
||||||
|
Page<EbikeEcuEnterRecords> pageRecords = ebikeComponentService.getPageRecords(reqEbikeEcuEnterRecordsDto);
|
||||||
|
return JsonResult.success(pageRecords);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,6 +3,11 @@ 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.ReqComponentEnterRecordDto;
|
||||||
import com.cdzy.ebikeoperate.model.dto.request.ReqComponentOutRecordDto;
|
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 com.mybatisflex.core.service.IService;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@ -55,4 +60,12 @@ public interface EbikeComponentService {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
JsonResult<?> invalidateOutDevicePart(String componentOutRecordId);
|
JsonResult<?> invalidateOutDevicePart(String componentOutRecordId);
|
||||||
|
/**
|
||||||
|
* 分页查询Ecu入库记录。
|
||||||
|
*
|
||||||
|
* @param reqEbikeEcuEnterRecordsDto 分页查询条件
|
||||||
|
* @return 分页对象
|
||||||
|
*/
|
||||||
|
Page<EbikeEcuEnterRecords> getPageRecords(ReqEbikeEcuEnterRecordsDto reqEbikeEcuEnterRecordsDto);
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -7,10 +7,13 @@ 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.ReqComponentEnterRecordDto;
|
||||||
import com.cdzy.ebikeoperate.model.dto.request.ReqComponentOutRecordDto;
|
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;
|
||||||
import com.ebike.feign.model.rsp.StaffFeign;
|
import com.ebike.feign.model.rsp.StaffFeign;
|
||||||
|
import com.mybatisflex.core.paginate.Page;
|
||||||
import com.mybatisflex.core.query.QueryWrapper;
|
import com.mybatisflex.core.query.QueryWrapper;
|
||||||
import jakarta.annotation.Resource;
|
import jakarta.annotation.Resource;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@ -20,6 +23,9 @@ import org.springframework.transaction.annotation.Transactional;
|
|||||||
import java.time.LocalDateTime;
|
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.EbikeHelmetEnterRecordsTableDef.EBIKE_HELMET_ENTER_RECORDS;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 部件的相关接口实现
|
* 部件的相关接口实现
|
||||||
*/
|
*/
|
||||||
@ -640,4 +646,19 @@ public class EbikeComponentServiceImpl implements EbikeComponentService {
|
|||||||
// 返回获取到的 StaffFeign 数据
|
// 返回获取到的 StaffFeign 数据
|
||||||
return result.getData();
|
return result.getData();
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* 分页查询Ecu入库记录。
|
||||||
|
*
|
||||||
|
* @param reqEbikeEcuEnterRecordsDto 分页查询条件
|
||||||
|
* @return 分页对象
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public Page<EbikeEcuEnterRecords> 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<EbikeEcuEnterRecords> page = reqEbikeEcuEnterRecordsDto.getPageParam().getPage();
|
||||||
|
return ebikeEcuEnterRecordsMapper.paginate(page, query);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user