diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java index ad6eee76..816c0f10 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapLogistic.java @@ -44,7 +44,7 @@ public class MapLogistic extends CommonEntity { @ApiModelProperty("收样员起点经度值") private BigDecimal courierLng; - @ApiModelProperty("收样员起点纬度值 ") + @ApiModelProperty("收样员起点纬度值") private BigDecimal courierLat; @ApiModelProperty("发单下级医院ID") @@ -56,7 +56,7 @@ public class MapLogistic extends CommonEntity { @ApiModelProperty("发单起点经度值") private BigDecimal sendOrderLng; - @ApiModelProperty("发单起点纬度值 ") + @ApiModelProperty("发单起点纬度值") private BigDecimal sendOrderLat; @ApiModelProperty("客服上传做项目原始单文件ID") diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java index e3b0d782..12e723dc 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticController.java @@ -9,6 +9,8 @@ import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.commonbiz.api.entity.MapLogistic; import com.cloud.kicc.commonbiz.service.IMapLogisticService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -25,6 +27,7 @@ import java.util.Arrays; @RestController @RequestMapping(AppConstants.APP_COMMON + "/mapLogistic") @RequiredArgsConstructor +@Api(tags = "地图物流管理") public class MapLogisticController { private final IMapLogisticService iMapLogisticService; @@ -38,30 +41,35 @@ public class MapLogisticController { } @GetMapping("/list") + @ApiOperation(value = "分页查询", notes = "分页查询") public R list(Page page, MapLogistic mapLogistic) { IPage iPage = iMapLogisticService.page(page, getQueryWrapper(mapLogistic)); return R.ok(iPage.getRecords(), iPage.getTotal()); } @GetMapping("/{id:\\w+}") + @ApiOperation(value = "根据id获取", notes = "根据id获取") public R getById(@PathVariable("id") String id) { MapLogistic mapLogistic = iMapLogisticService.getById(id); return R.ok(mapLogistic); } @PostMapping("/save") + @ApiOperation(value = "保存", notes = "保存") public R save(@RequestBody MapLogistic mapLogistic) { iMapLogisticService.save(mapLogistic); return R.ok(); } @PutMapping("/update") + @ApiOperation(value = "修改", notes = "修改") public R update(@RequestBody MapLogistic mapLogistic) { iMapLogisticService.updateById(mapLogistic); return R.ok(); } @DeleteMapping("/remove/{ids:[\\w,]+}") + @ApiOperation(value = "删除", notes = "删除") public R remove(@PathVariable String[] ids) { iMapLogisticService.removeByIds(Arrays.asList(ids)); return R.ok(); diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticPointController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticPointController.java index f9aaf4e5..6fb2d3b8 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticPointController.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapLogisticPointController.java @@ -1,12 +1,25 @@ package com.cloud.kicc.commonbiz.controller; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; +import com.cloud.kicc.commonbiz.api.entity.MapLogisticPoint; +import com.cloud.kicc.commonbiz.api.entity.MapTask; +import com.cloud.kicc.commonbiz.api.entity.MapTaskPreset; +import com.cloud.kicc.commonbiz.service.IMapLogisticPointService; +import com.cloud.kicc.commonbiz.service.IMapTaskService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RestController; + +import java.util.Arrays; /** *

@@ -19,7 +32,51 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping(AppConstants.APP_COMMON + "/mapLogisticPoint") @RequiredArgsConstructor +@Api(tags = "地图物流标记点管理") public class MapLogisticPointController { + private final IMapLogisticPointService iMapLogisticPointService; + + private LambdaQueryWrapper getQueryWrapper(MapLogisticPoint mapLogisticPoint) { + return new LambdaQueryWrapper() + .eq(StrUtil.isNotBlank(mapLogisticPoint.getType()), MapLogisticPoint::getType, mapLogisticPoint.getType()) + .eq(StrUtil.isNotBlank(mapLogisticPoint.getMapLogisticId()), MapLogisticPoint::getMapLogisticId, mapLogisticPoint.getMapLogisticId()); + } + + @GetMapping("/list") + @ApiOperation(value = "分页查询", notes = "分页查询") + public R list(Page page, MapLogisticPoint mapLogisticPoint) { + IPage result = iMapLogisticPointService.page(page, getQueryWrapper(mapLogisticPoint)); + return R.ok(result.getRecords(), result.getTotal()); + } + + @GetMapping("/{id:\\w+}") + @ApiOperation(value = "根据id获取", notes = "根据id获取") + public R getById(@PathVariable("id") String id) { + MapLogisticPoint mapLogisticPoint = iMapLogisticPointService.getById(id); + return R.ok(mapLogisticPoint); + } + + @PostMapping("/save") + @ApiOperation(value = "保存", notes = "保存") + public R save(@RequestBody MapLogisticPoint mapLogisticPoint) { + iMapLogisticPointService.save(mapLogisticPoint); + return R.ok(); + } + + @PutMapping("/update") + @ApiOperation(value = "修改", notes = "修改") + public R update(@RequestBody MapLogisticPoint mapLogisticPoint) { + iMapLogisticPointService.updateById(mapLogisticPoint); + return R.ok(); + } + + @DeleteMapping("/remove/{ids:[\\w,]+}") + @ApiOperation(value = "删除", notes = "删除") + public R remove(@PathVariable String[] ids) { + iMapLogisticPointService.removeByIds(Arrays.asList(ids)); + return R.ok(); + } + } diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java index 314c5819..720ecf1d 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskController.java @@ -1,12 +1,19 @@ package com.cloud.kicc.commonbiz.controller; - +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; +import com.cloud.kicc.commonbiz.api.entity.MapTask; +import com.cloud.kicc.commonbiz.service.IMapTaskService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RestController; +import java.util.Arrays; /** *

@@ -19,7 +26,51 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping(AppConstants.APP_COMMON + "/mapTask") @RequiredArgsConstructor +@Api(tags = "地图任务管理") public class MapTaskController { + private final IMapTaskService iMapTaskService; + + private LambdaQueryWrapper getQueryWrapper(MapTask mapTask) { + return new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(mapTask.getName()), MapTask::getName, mapTask.getName()) + .eq(StrUtil.isNotBlank(mapTask.getMapLogisticId()), MapTask::getMapLogisticId, mapTask.getMapLogisticId()); + } + + @GetMapping("/list") + @ApiOperation(value = "分页查询", notes = "分页查询") + public R list(Page page, MapTask mapTask) { + IPage result = iMapTaskService.page(page, getQueryWrapper(mapTask)); + return R.ok(result.getRecords(), result.getTotal()); + } + + @GetMapping("/{id:\\w+}") + @ApiOperation(value = "根据id获取", notes = "根据id获取") + public R getById(@PathVariable("id") String id) { + MapTask mapTask = iMapTaskService.getById(id); + return R.ok(mapTask); + } + + @PostMapping("/save") + @ApiOperation(value = "保存", notes = "保存") + public R save(@RequestBody MapTask mapTask) { + iMapTaskService.save(mapTask); + return R.ok(); + } + + @PutMapping("/update") + @ApiOperation(value = "修改", notes = "修改") + public R update(@RequestBody MapTask mapTask) { + iMapTaskService.updateById(mapTask); + return R.ok(); + } + + @DeleteMapping("/remove/{ids:[\\w,]+}") + @ApiOperation(value = "删除", notes = "删除") + public R remove(@PathVariable String[] ids) { + iMapTaskService.removeByIds(Arrays.asList(ids)); + return R.ok(); + } + } diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskPresetController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskPresetController.java index 29431294..0f4e9f69 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskPresetController.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/MapTaskPresetController.java @@ -9,6 +9,8 @@ import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.commonbiz.api.entity.MapTaskPreset; import com.cloud.kicc.commonbiz.service.IMapTaskPresetService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -26,41 +28,48 @@ import java.util.Arrays; @RestController @RequestMapping(AppConstants.APP_COMMON + "/mapTaskPreset") @RequiredArgsConstructor +@Api(tags = "地图交接任务预设管理") public class MapTaskPresetController { private final IMapTaskPresetService iMapTaskPresetService; private LambdaQueryWrapper getQueryWrapper(MapTaskPreset mapTaskPreset) { return new LambdaQueryWrapper() + .eq(StrUtil.isNotBlank(mapTaskPreset.getCourierUserId()), MapTaskPreset::getCourierUserId, mapTaskPreset.getCourierUserId()) .like(StrUtil.isNotBlank(mapTaskPreset.getName()), MapTaskPreset::getName, mapTaskPreset.getName()) .eq(StrUtil.isNotBlank(mapTaskPreset.getMapLogisticId()), MapTaskPreset::getMapLogisticId, mapTaskPreset.getMapLogisticId()); } @GetMapping("/list") + @ApiOperation(value = "分页查询", notes = "分页查询") public R list(Page page, MapTaskPreset mapTaskPreset) { IPage result = iMapTaskPresetService.page(page, getQueryWrapper(mapTaskPreset)); return R.ok(result.getRecords(), result.getTotal()); } @GetMapping("/{id:\\w+}") + @ApiOperation(value = "根据id获取", notes = "根据id获取") public R getById(@PathVariable("id") String id) { MapTaskPreset mapTaskPreset = iMapTaskPresetService.getById(id); return R.ok(mapTaskPreset); } @PostMapping("/save") + @ApiOperation(value = "保存", notes = "保存") public R save(@RequestBody MapTaskPreset mapTaskPreset) { iMapTaskPresetService.save(mapTaskPreset); return R.ok(); } @PutMapping("/update") + @ApiOperation(value = "修改", notes = "修改") public R update(@RequestBody MapTaskPreset mapTaskPreset) { iMapTaskPresetService.updateById(mapTaskPreset); return R.ok(); } @DeleteMapping("/remove/{ids:[\\w,]+}") + @ApiOperation(value = "删除", notes = "删除") public R remove(@PathVariable String[] ids) { iMapTaskPresetService.removeByIds(Arrays.asList(ids)); return R.ok();