From 327a2179aa40450e5ad7dcc0d4a2be4ac0d87c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Mon, 17 Mar 2025 15:41:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E8=A1=8C=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/artificer/entity/Artificer.java | 5 ++ .../controller/TravelAdjustController.java | 75 ++++++++++++++++++ .../traveladjust/dao/TravelAdjustDao.java | 16 ++++ .../traveladjust/entity/TravelAdjust.java | 79 +++++++++++++++++++ .../service/TravelAdjustService.java | 15 ++++ .../service/impl/TravelAdjustServiceImpl.java | 24 ++++++ .../service/impl/TravelConfServiceImpl.java | 31 ++++++-- .../mapper/traveladjust/TravelAdjustDao.xml | 24 ++++++ 8 files changed, 264 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/sqx/modules/traveladjust/controller/TravelAdjustController.java create mode 100644 src/main/java/com/sqx/modules/traveladjust/dao/TravelAdjustDao.java create mode 100644 src/main/java/com/sqx/modules/traveladjust/entity/TravelAdjust.java create mode 100644 src/main/java/com/sqx/modules/traveladjust/service/TravelAdjustService.java create mode 100644 src/main/java/com/sqx/modules/traveladjust/service/impl/TravelAdjustServiceImpl.java create mode 100644 src/main/resources/mapper/traveladjust/TravelAdjustDao.xml diff --git a/src/main/java/com/sqx/modules/artificer/entity/Artificer.java b/src/main/java/com/sqx/modules/artificer/entity/Artificer.java index b5288a0..df9232d 100644 --- a/src/main/java/com/sqx/modules/artificer/entity/Artificer.java +++ b/src/main/java/com/sqx/modules/artificer/entity/Artificer.java @@ -261,6 +261,11 @@ public class Artificer implements Serializable { */ private Integer acceptOrders; + /** + * 技师是否可调整出行方式 1是 2否 + */ + private Integer adjustWay; + @TableField(exist = false) private List artificerClassifyList; diff --git a/src/main/java/com/sqx/modules/traveladjust/controller/TravelAdjustController.java b/src/main/java/com/sqx/modules/traveladjust/controller/TravelAdjustController.java new file mode 100644 index 0000000..8ab3a3d --- /dev/null +++ b/src/main/java/com/sqx/modules/traveladjust/controller/TravelAdjustController.java @@ -0,0 +1,75 @@ +package com.sqx.modules.traveladjust.controller; + +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.sqx.common.utils.Result; +import com.sqx.modules.traveladjust.entity.TravelAdjust; +import com.sqx.modules.traveladjust.service.TravelAdjustService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; + +/** + * @author bai + * @date 2024/06/08 + */ +@RestController +@Api(value = "出行管理", tags = { "出行管理" }) +@RequestMapping(value = "/travelAdjust") +public class TravelAdjustController { + + @Autowired + private TravelAdjustService service; + + @GetMapping("/list") + @ApiOperation("获取数据列表") + public Result list(TravelAdjust entity, Integer page, Integer limit){ + QueryWrapper qw = new QueryWrapper<>(); + IPage pageList = service.page(new Page<>(page,limit),qw); + return Result.success().put("data",pageList); + } + + @PostMapping(value = "/add") + @ApiOperation("新增") + public Result add(@RequestBody TravelAdjust entity){ + entity.setCreateTime(DateUtil.now()); + entity.setUpdateTime(DateUtil.now()); + return Result.success().put("data",service.save(entity)); + } + + @PostMapping(value = "/update") + @ApiOperation("修改") + public Result update(@RequestBody TravelAdjust entity){ + entity.setUpdateTime(DateUtil.now()); + return Result.success().put("data",service.updateById(entity)); + } + + @RequestMapping("/info/{id}") + public Result info(@PathVariable("id") Long id){ + TravelAdjust data = service.getById(id); + return Result.success().put("data", data); + } + + @DeleteMapping(value = "/deleteById") + @ApiOperation("删除") + public Result deleteById(Long id){ + service.removeById(id); + return Result.success(); + } + + @DeleteMapping(value = "/deleteByIds") + @ApiOperation("批量删除") + public Result deleteByIds(String id){ + if(StringUtils.isNotBlank(id)){ + String[] ids = StringUtils.split(id,","); + service.removeByIds(Arrays.asList(ids)); + } + return Result.success(); + } +} \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/traveladjust/dao/TravelAdjustDao.java b/src/main/java/com/sqx/modules/traveladjust/dao/TravelAdjustDao.java new file mode 100644 index 0000000..308e5ba --- /dev/null +++ b/src/main/java/com/sqx/modules/traveladjust/dao/TravelAdjustDao.java @@ -0,0 +1,16 @@ +package com.sqx.modules.traveladjust.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.sqx.modules.traveladjust.entity.TravelAdjust; +import org.apache.ibatis.annotations.Mapper; + +import java.util.Date; + +/** + * @author bai + * @date 2024/06/08 + */ +@Mapper +public interface TravelAdjustDao extends BaseMapper { + public TravelAdjust getTravelType(String businessTime); +} diff --git a/src/main/java/com/sqx/modules/traveladjust/entity/TravelAdjust.java b/src/main/java/com/sqx/modules/traveladjust/entity/TravelAdjust.java new file mode 100644 index 0000000..d12bfbf --- /dev/null +++ b/src/main/java/com/sqx/modules/traveladjust/entity/TravelAdjust.java @@ -0,0 +1,79 @@ +package com.sqx.modules.traveladjust.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @author sentfan + * @date 2025/03/17 + */ +@ApiModel("出行调整") +@Data +@TableName("travel_adjust") +public class TravelAdjust implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ApiModelProperty("主键") + @TableId(type = IdType.AUTO) + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private String createTime; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private String updateTime; + + /** + * 切换时间点1 + */ + @ApiModelProperty("切换时间点1") + private String pointTime1; + + /** + * 出行方式1(1:公交,2:出租,3:免费) + */ + @ApiModelProperty("出行方式(1:公交,2:出租,3:免费)") + private Integer travelType1; + + /** + * 免费公里数1 + */ + @ApiModelProperty("免费公里数1") + private BigDecimal travelNum1; + + /** + * 切换时间点2 + */ + @ApiModelProperty("切换时间点2") + private String pointTime2; + + /** + * 出行方式2(1:公交,2:出租,3:免费) + */ + @ApiModelProperty("出行方式(1:公交,2:出租,3:免费)") + private Integer travelType2; + + /** + * 免费公里数2 + */ + @ApiModelProperty("免费公里数2") + private BigDecimal travelNum2; + + +} \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/traveladjust/service/TravelAdjustService.java b/src/main/java/com/sqx/modules/traveladjust/service/TravelAdjustService.java new file mode 100644 index 0000000..5dd2c1e --- /dev/null +++ b/src/main/java/com/sqx/modules/traveladjust/service/TravelAdjustService.java @@ -0,0 +1,15 @@ +package com.sqx.modules.traveladjust.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.sqx.modules.traveladjust.entity.TravelAdjust; + +public interface TravelAdjustService extends IService { + + /** + * 获取出行方式 + * @param + * @return + */ + TravelAdjust getTravelType(String businessTime); + +} diff --git a/src/main/java/com/sqx/modules/traveladjust/service/impl/TravelAdjustServiceImpl.java b/src/main/java/com/sqx/modules/traveladjust/service/impl/TravelAdjustServiceImpl.java new file mode 100644 index 0000000..a82bdea --- /dev/null +++ b/src/main/java/com/sqx/modules/traveladjust/service/impl/TravelAdjustServiceImpl.java @@ -0,0 +1,24 @@ +package com.sqx.modules.traveladjust.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.sqx.modules.traveladjust.dao.TravelAdjustDao; +import com.sqx.modules.traveladjust.entity.TravelAdjust; +import com.sqx.modules.traveladjust.service.TravelAdjustService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * 消息 + */ +@Service +public class TravelAdjustServiceImpl extends ServiceImpl implements TravelAdjustService { + + @Autowired + TravelAdjustDao travelAdjustDao; + + @Override + public TravelAdjust getTravelType(String businessTime) { + return travelAdjustDao.getTravelType(businessTime); + } + +} diff --git a/src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java b/src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java index c0206d7..5b41875 100644 --- a/src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java +++ b/src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java @@ -15,6 +15,8 @@ import com.sqx.modules.common.entity.CommonInfo; import com.sqx.modules.common.enums.CommonEnum; import com.sqx.modules.common.service.CommonInfoService; import com.sqx.modules.common.utils.CommonConfigUtil; +import com.sqx.modules.traveladjust.dao.TravelAdjustDao; +import com.sqx.modules.traveladjust.entity.TravelAdjust; import com.sqx.modules.travelconf.dao.TravelConfDao; import com.sqx.modules.travelconf.entity.TravelConf; import com.sqx.modules.travelconf.enums.TravelEnum; @@ -39,6 +41,9 @@ public class TravelConfServiceImpl extends ServiceImpl + + + + + + + \ No newline at end of file