attiya/ebike-plus
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: attiya:a936079aa026db971346838fb38f484be44020eba66ee8b3ac0e687a9fac6d76
Branches Tags
attiya:main
attiya:dev
..
compare: attiya:6c3023a05866c9ed4e2b55136ffbea1cdb81f1014caccf84736940ae8e4982ee
Branches Tags
attiya:main
attiya:dev

No commits in common. "a936079aa026db971346838fb38f484be44020eba66ee8b3ac0e687a9fac6d76" and "6c3023a05866c9ed4e2b55136ffbea1cdb81f1014caccf84736940ae8e4982ee" have entirely different histories.
a936079aa0 ... 6c3023a058

9 changed files with 14 additions and 144 deletions
Show Stats Expand all files Collapse all files

5
ebike-feign/src/main/java/com/ebike/feign/clients/OperationsFeignClient.java
View File

@ -7,7 +7,6 @@ import com.ebike.feign.model.dto.FeignEbikeDto;
import com.ebike.feign.model.dto.FeignEbikeUserBikeInfo;
import com.ebike.feign.model.dto.FeignEbikeUserLockDto;
import com.ebike.feign.model.vo.FeignEbikeBikeRadiusVo;
import com.ebike.feign.model.vo.FeignInspectionSwapOrderVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@ -70,7 +69,7 @@ public interface OperationsFeignClient {
*
* @return 结果
*/
@PostMapping("/ebikeBikeOrder/inspectionSwapOrder")
JsonResult<FeignEbikeUserBikeInfo> inspectionSwapOrder(@RequestBody FeignInspectionSwapOrderVo inspectionSwapOrderVo);
@GetMapping("/ebikeBikeOrder/inspectionSwapOrder")
JsonResult<FeignEbikeUserBikeInfo> inspectionSwapOrder(@RequestParam("bikeCode")String bikeCode);
}

29
ebike-feign/src/main/java/com/ebike/feign/model/vo/FeignInspectionSwapOrderVo.java
View File

@ -1,29 +0,0 @@
package com.ebike.feign.model.vo;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @author attiya
* @since 2025-11-26
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class FeignInspectionSwapOrderVo {
@NotNull(message = "车辆编号不能为空")
private String bikeCode;
@NotNull(message = "故障部位不能为空")
private List<Integer> parts;
@NotNull(message = "故障部位图片不能为空")
private List<String> fileUrls;
}

13
ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java
View File

@ -4,7 +4,6 @@ import com.cdzy.common.model.request.PageParam;
import com.cdzy.common.model.response.JsonResult;
import com.cdzy.operations.enums.BikeOrderHandleState;
import com.cdzy.operations.model.dto.EbikeBikeOrderPageDto;
import com.cdzy.operations.model.vo.InspectionSwapOrderVo;
import com.cdzy.operations.service.EbikeBikeOrderService;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
@ -12,7 +11,9 @@ import com.mybatisflex.core.util.StringUtil;
import jakarta.annotation.Resource;
import jakarta.validation.constraints.NotNull;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Objects;
@ -67,12 +68,12 @@ public class EbikeBikeOrderController {
/**
* 生成巡检工单。
*
* @param inspectionSwapOrderVo 巡检信息
* @param bikeCode 车辆编号
* @return 结果
*/
@PostMapping("inspectionSwapOrder")
public JsonResult<?> inspectionSwapOrder(@Validated @RequestBody InspectionSwapOrderVo inspectionSwapOrderVo) {
ebikeBikeOrderService.createInspectionSwapOrder(inspectionSwapOrderVo);
@GetMapping("inspectionSwapOrder")
public JsonResult<?> inspectionSwapOrder(@NotNull(message = "车辆编号不能为空") String bikeCode) {
ebikeBikeOrderService.createInspectionSwapOrder(bikeCode);
return JsonResult.success();
}

14
ebike-operations/src/main/java/com/cdzy/operations/mapper/EbikeOrderPartMapper.java
View File

@ -1,14 +0,0 @@
package com.cdzy.operations.mapper;
import com.mybatisflex.core.BaseMapper;
import com.cdzy.operations.model.entity.EbikeOrderPart;
/**
* 工单故障部位表 映射层。
*
* @author attiya
* @since 2025-11-26
*/
public interface EbikeOrderPartMapper extends BaseMapper<EbikeOrderPart> {
}

55
ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeOrderPart.java
View File

@ -1,55 +0,0 @@
package com.cdzy.operations.model.entity;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* 工单故障部位表 实体类。
*
* @author attiya
* @since 2025-11-26
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table("ebike_order_part")
public class EbikeOrderPart implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@Id
private Long orderPartId;
/**
* 报告id
*/
private Long orderId;
/**
* 损坏部件
*/
private Integer orderPart;
/**
* 创建时间
*/
@Column(onInsertValue = "now()")
private LocalDateTime createTime;
private Boolean isDeleted;
}

29
ebike-operations/src/main/java/com/cdzy/operations/model/vo/InspectionSwapOrderVo.java
View File

@ -1,29 +0,0 @@
package com.cdzy.operations.model.vo;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @author attiya
* @since 2025-11-26
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class InspectionSwapOrderVo {
@NotNull(message = "车辆编号不能为空")
private String bikeCode;
@NotNull(message = "故障部位不能为空")
private List<Integer> parts;
@NotNull(message = "故障部位图片不能为空")
private List<String> fileUrls;
}

5
ebike-operations/src/main/java/com/cdzy/operations/service/EbikeBikeOrderService.java
View File

@ -1,6 +1,5 @@
package com.cdzy.operations.service;
import com.cdzy.operations.model.vo.InspectionSwapOrderVo;
import com.mybatisflex.core.service.IService;
import com.cdzy.operations.model.entity.EbikeBikeOrder;
@ -21,9 +20,9 @@ public interface EbikeBikeOrderService extends IService<EbikeBikeOrder> {
/**
* 根据车辆编号（bikeCode）生成车辆巡检工单
* @param inspectionSwapOrderVo 巡检信息
* @param bikeCode 车辆编号
*/
void createInspectionSwapOrder(InspectionSwapOrderVo inspectionSwapOrderVo);
void createInspectionSwapOrder(String bikeCode);
/**
* 根据车辆编号（bikeCode）生成车辆调度工单

6
ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
View File

@ -10,7 +10,6 @@ import com.cdzy.operations.model.entity.EbikeBikeInfo;
import com.cdzy.operations.model.entity.EbikeBikeOrder;
import com.cdzy.operations.model.entity.EbikeRegion;
import com.cdzy.operations.model.entity.EbikeSite;
import com.cdzy.operations.model.vo.InspectionSwapOrderVo;
import com.cdzy.operations.service.EbikeBikeOrderService;
import com.mybatisflex.core.keygen.impl.SnowFlakeIDKeyGenerator;
import com.mybatisflex.core.query.QueryWrapper;
@ -78,8 +77,8 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
}
@Override
public void createInspectionSwapOrder(InspectionSwapOrderVo inspectionSwapOrderVo) {
EbikeBikeInfo bikeInfo = checkBikeCode(inspectionSwapOrderVo.getBikeCode());
public void createInspectionSwapOrder(String bikeCode) {
EbikeBikeInfo bikeInfo = checkBikeCode(bikeCode);
QueryWrapper queryWrapper = QueryWrapper.create().where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(bikeInfo.getBikeCode()))
.where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.INSPECTION));
EbikeBikeOrder bikeOrder = this.mapper.selectOneByQuery(queryWrapper);
@ -94,7 +93,6 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
.operatorId(bikeInfo.getOperatorId())
.build();
this.mapper.insert(ebikeBikeOrder);
//TODO:生成文件相关内容
}
@Transactional

2
ebike-staff/src/test/java/com/cdzy/staff/EbikeStaffApplicationTests.java
View File

@ -12,7 +12,7 @@ class EbikeStaffApplicationTests {
private static final String mapperPath="D:/ebike_plus/ebike-operations/resources/mapper";
private static final String packageName ="com.cdzy.operations";
private static final String[] tables= new String[]{
"ebike_order_file"
"ebike_bike_order"
};
@Test