xp-robotaxi-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -36,7 +36,6 @@ com.xiaopeng.api.factory.maintenance.XpClockInClientFallbackFactory com.xiaopeng.api.factory.account.SysGroupMenuClientFallbackFactory com.xiaopeng.api.factory.order.XpCruiseOrderClientFallbackFactory com.xiaopeng.api.factory.order.XpReassignOrderClientFallbackFactory com.xiaopeng.api.factory.operation.SmsClientFallbackFactory com.xiaopeng.api.factory.maintenance.XpTaskHandleDetailRoutineClientFallbackFactory com.xiaopeng.api.factory.maintenance.XpTaskClientFallbackFactory xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpShiftController.java
@@ -43,15 +43,13 @@ @ApiOperation(value = "班次管理新增", tags = "管理后台-运维执行") @PostMapping("/api/v1/shift/add") public R<String> add(@RequestBody XpShift dto) { xpShiftService.save(dto); return R.ok(); return xpShiftService.add(dto); } @ApiOperation(value = "班次管理编辑", tags = "管理后台-运维执行") @PostMapping("/api/v1/shift/edit") public R<String> edit(@RequestBody XpShift dto) { xpShiftService.updateById(dto); return R.ok(); return xpShiftService.edit(dto); } @ApiOperation(value = "班次管理删除", tags = "管理后台-运维执行") xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/IXpShiftService.java
@@ -2,6 +2,7 @@ import com.xiaopeng.api.model.maintenance.XpShift; import com.baomidou.mybatisplus.extension.service.IService; import com.xiaopeng.common.core.domain.R; import com.xiaopeng.common.core.web.page.PageInfo; import com.xiaopeng.maintenance.model.query.XpShiftQuery; @@ -31,4 +32,18 @@ * @return */ List<XpShift> queryList(); /** * 新增 * @param dto * @return */ R<String> add(XpShift dto); /** * 编辑 * @param dto * @return */ R<String> edit(XpShift dto); } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpShiftServiceImpl.java
@@ -46,4 +46,46 @@ public List<XpShift> queryList() { return this.list(new LambdaQueryWrapper<XpShift>().eq(XpShift::getDeleted, 0)); } @Override public R<String> add(XpShift dto) { // 判断结束时间是否大于开始时间 格式为 HH:mm if (dto.getEndTime().compareTo(dto.getStartTime()) < 0) { return R.fail("结束时间不能小于开始时间"); } // 判断休息结束时间是否大于休息开始时间 格式为 HH:mm if (dto.getRestEndTime() != null && dto.getRestStartTime() != null && dto.getRestEndTime().compareTo(dto.getRestStartTime()) < 0) { return R.fail("休息结束时间不能小于休息开始时间"); } if (this.count(new LambdaQueryWrapper<XpShift>().eq(XpShift::getShiftName, dto.getShiftName())) > 0) { return R.fail("班次名称已存在"); } this.save(dto); return R.ok(); } @Override public R<String> edit(XpShift dto) { // 判断结束时间是否大于开始时间 格式为 HH:mm if (dto.getEndTime().compareTo(dto.getStartTime()) < 0) { return R.fail("结束时间不能小于开始时间"); } // 判断休息结束时间是否大于休息开始时间 格式为 HH:mm if (dto.getRestEndTime() != null && dto.getRestStartTime() != null && dto.getRestEndTime().compareTo(dto.getRestStartTime()) < 0) { return R.fail("休息结束时间不能小于休息开始时间"); } if (this.count(new LambdaQueryWrapper<XpShift>().eq(XpShift::getShiftName, dto.getShiftName()).ne(XpShift::getId, dto.getId())) > 0) { return R.fail("班次名称已存在"); } this.updateById(dto); return R.ok(); } } xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpInvitationCodeController.java
@@ -56,7 +56,7 @@ @RestController @Api(tags = "邀请码管理") @Slf4j @RequestMapping("/api/v1/invitation") @RequestMapping("") public class XpInvitationCodeController { @Resource private IXpInvitationCodeService xpInvitationCodeService; @@ -64,7 +64,7 @@ private IXpWhitelistService xpWhitelistService; @ApiOperation(value = "邀请码管理分页列表",response = XpInvitationCode.class) @PostMapping("/pageList") @PostMapping("/api/v1/invitation/pageList") public R<PageInfo<XpInvitationCode>> pageList(@RequestBody InvitationPageListQuery query) { PageInfo<XpInvitationCode> pageList = xpInvitationCodeService.pageList(query); return R.ok(pageList); @@ -72,7 +72,7 @@ /** * 生成邀请码 */ @PutMapping("/add") @PutMapping("/api/v1/invitation/add") @ResponseBody @ApiOperation(value = "生成邀请码") @ApiImplicitParams({ @@ -85,7 +85,7 @@ /** * 解绑 */ @PutMapping("/unbind") @PutMapping("/api/v1/invitation/unbind") @ResponseBody @ApiOperation(value = "解绑") @ApiImplicitParams({ @@ -100,7 +100,7 @@ return R.ok(); } @ApiOperation(value = "点位导入模板下载") @GetMapping("/import-template") @GetMapping("/api/v1/invitation/import-template") public void importTemplate() { List<InvitationCodeImportExcel> invitationCodeImportExcels = new ArrayList<>(); InvitationCodeImportExcel invitationCodeImportExcel = new InvitationCodeImportExcel(); @@ -129,7 +129,7 @@ } @Log(title = "邀请码导入", businessType = BusinessType.IMPORT) @ApiOperation(value = "邀请码导入") @PostMapping("/importExcel") @PostMapping("/base/v1/invitation/importExcel") public R<String> importExcel(@RequestPart("file") MultipartFile file) { ImportParams params = new ImportParams(); // params.setTitleRows(1); // 标题行数 @@ -204,7 +204,7 @@ return R.ok(); } @ApiOperation(value = "邀请码导出") @PostMapping(value = "/exportExcel") @PostMapping(value = "/api/v1/invitation/exportExcel") public void exportExcel(@RequestBody InvitationPageListQuery query) { List<XpInvitationCode> list = xpInvitationCodeService.exportList(query); List<XpInvitationCodeExportExcel> xpWhitelistExportExcels = new ArrayList<>(); @@ -245,7 +245,7 @@ /** * 批量删除 */ @GetMapping("/deleteByIds") @GetMapping("/api/v1/invitation/deleteByIds") @ResponseBody @ApiOperation(value = "批量删除") public R deleteByIds(String ids){
