diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/pojo/ReqVehicleStatusUpdateDto.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqVehicleStatusUpdateDto.java similarity index 83% rename from ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/pojo/ReqVehicleStatusUpdateDto.java rename to ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqVehicleStatusUpdateDto.java index fc9e3fe5..c2f87fdc 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/pojo/ReqVehicleStatusUpdateDto.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqVehicleStatusUpdateDto.java @@ -1,4 +1,4 @@ -package com.cdzy.ebikemaintenance.model.pojo; +package com.cdzy.ebikemaintenance.model.dto.request; import lombok.Data; diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java index fce3f4e3..4e88e929 100644 --- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java +++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java @@ -16,7 +16,6 @@ import com.cdzy.ebikemaintenance.model.dto.response.*; import com.cdzy.ebikemaintenance.model.pojo.*; import com.cdzy.ebikemaintenance.service.EbikeBikeInfoService; import com.cdzy.ebikemaintenance.service.EbikeBikeOrderService; -import com.cdzy.ebikemaintenance.service.EbikeScheduleWorkOrderExtensionService; import com.cdzy.ebikemaintenance.utils.GeoCodingUtil; import com.cdzy.ebikemaintenance.utils.MinioUtil; import com.cdzy.ebikemaintenance.utils.RedisUtil; @@ -35,7 +34,6 @@ import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.common.errors.ResourceNotFoundException; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysRcostsetController.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysRcostsetController.java index 6fe73eba..c8ec5194 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysRcostsetController.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysRcostsetController.java @@ -15,6 +15,7 @@ import com.cdzy.ebikeoperate.model.pojo.EbikeSysRcostsetWeek; import com.cdzy.ebikeoperate.service.EbikeSysRcostsetService; import com.cdzy.ebikeoperate.service.EbikeSysRcostsetTimePeriodService; import com.cdzy.ebikeoperate.service.EbikeSysRcostsetWeekService; +import com.mybatisflex.core.keygen.impl.SnowFlakeIDKeyGenerator; import com.mybatisflex.core.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -210,4 +211,17 @@ public class EbikeSysRcostsetController { return JsonResult.failed("更新失败"); } } + + /** + * 生成一个雪花id + * + * @return + */ + @RequestMapping("createSnowflakeId") + public JsonResult createSnowflakeId() { + + SnowFlakeIDKeyGenerator snowFlakeIDKeyGenerator = new SnowFlakeIDKeyGenerator(); + long dataCenterId = snowFlakeIDKeyGenerator.nextId(); + return JsonResult.success(dataCenterId); + } } diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysRoperatesetController.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysRoperatesetController.java index 16d9a25b..7251fbcb 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysRoperatesetController.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysRoperatesetController.java @@ -1,5 +1,6 @@ package com.cdzy.ebikeoperate.controller; +import com.cdzy.common.model.JsonResult; import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeSysRoperatesetsDto; import com.cdzy.ebikeoperate.model.dto.response.ResEbikeSysRoperatesetsDto; import com.cdzy.ebikeoperate.model.pojo.EbikeSysRoperateset; @@ -27,8 +28,9 @@ public class EbikeSysRoperatesetController { * @return {@code true} 添加成功,{@code false} 添加失败 */ @PostMapping("save") - public boolean save(@RequestBody ReqEbikeSysRoperatesetsDto reqEbikeSysRoperatesetsDto) { - return ebikeSysRoperatesetService.save(reqEbikeSysRoperatesetsDto); + public JsonResult save(@RequestBody ReqEbikeSysRoperatesetsDto reqEbikeSysRoperatesetsDto) { + Boolean save = ebikeSysRoperatesetService.save(reqEbikeSysRoperatesetsDto); + return save ? JsonResult.success(true) : JsonResult.failed(""); } /** @@ -43,9 +45,9 @@ public class EbikeSysRoperatesetController { } @RequestMapping("getRegionConfigById") - public ResEbikeSysRoperatesetsDto getRegionConfigById(@RequestParam(value = "regionId") - String regionId) { + public JsonResult getRegionConfigById(@RequestParam(value = "regionId") + String regionId) { ResEbikeSysRoperatesetsDto resEbikeSysRoperatesetsDto = new ResEbikeSysRoperatesetsDto(); - return resEbikeSysRoperatesetsDto; + return JsonResult.success(null); } } diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRcostsetDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRcostsetDto.java index 1057e4c8..6e6f6de0 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRcostsetDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRcostsetDto.java @@ -17,6 +17,9 @@ import java.util.List; @Data public class ReqEbikeSysRcostsetDto implements Serializable { + + private String costConfigId; + /** * 区域id */ diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSysRoperatesetServiceImpl.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSysRoperatesetServiceImpl.java index 09b60dfa..022efd15 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSysRoperatesetServiceImpl.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSysRoperatesetServiceImpl.java @@ -4,6 +4,7 @@ import com.cdzy.ebikeoperate.mapper.EbikeSysLinktelMapper; import com.cdzy.ebikeoperate.mapper.EbikeSysOperateSetMapper; import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeSysRoperatesetDto; import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeSysRoperatesetsDto; +import com.cdzy.ebikeoperate.model.pojo.EbikeSysRcostset; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import com.cdzy.ebikeoperate.model.pojo.EbikeSysRoperateset; @@ -11,6 +12,7 @@ import com.cdzy.ebikeoperate.mapper.EbikeSysRoperatesetMapper; import com.cdzy.ebikeoperate.service.EbikeSysRoperatesetService; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -63,7 +65,8 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl