Merge branch 'cjl' into qa

cjl

2023-10-07 8b5439ba2748f91720975f73e7479a751d6a452b

 screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java

@@ -21,6 +21,13 @@
import com.moral.api.service.ManageCoordinateService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Map;

@Slf4j
@RestController
@@ -34,19 +41,19 @@
    private ManageCoordinateMapper manageCoordinateMapper;



    /**
     * 添加路段信息
     *
     * @param params
     * @return
     */
    @PostMapping("interCruiserRoad")
    public ResultMessage interCruiserRoad(@RequestBody Map<String,Object> params){
    public ResultMessage interCruiserRoad(@RequestBody Map<String, Object> params) {
        if (!params.containsKey("startPoint") || !params.containsKey("mac")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        Integer integer = manageCoordinateService.interCoordinate(params);
        if (integer==null){
        if (integer == null) {
            return ResultMessage.ok("路段已存在");
        }
        return ResultMessage.ok();
@@ -55,12 +62,13 @@

    /**
     * 修改路段信息
     *
     * @param manageCoordinate
     * @return
     */
    @PostMapping("updateCruiserRoad")
    public ResultMessage updateCruiserRoad(@RequestBody ManageCoordinate manageCoordinate){
        if (ObjectUtils.isEmpty(manageCoordinate)){
    public ResultMessage updateCruiserRoad(@RequestBody ManageCoordinate manageCoordinate) {
        if (ObjectUtils.isEmpty(manageCoordinate)) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        manageCoordinateService.updateCoordinate(manageCoordinate);
@@ -69,12 +77,13 @@

    /**
     * 删除路段信息
     *
     * @param id
     * @return
     */
    @GetMapping("deleteCruiserRoad")
    public ResultMessage deleteCruiser(Integer id){
        if (id==null){
    public ResultMessage deleteCruiser(Integer id) {
        if (id == null) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
@@ -88,8 +97,8 @@
     * @return
     */
    @GetMapping("selectCruiserRoad")
    public ResultMessage selectCruiser(String name,String mac){
        List<ManageCoordinate> manageCoordinates = manageCoordinateService.selectCoordinate(name,mac);
    public ResultMessage selectCruiser(String name, String mac) {
        List<ManageCoordinate> manageCoordinates = manageCoordinateService.selectCoordinate(name, mac);
        return ResultMessage.ok(manageCoordinates);
    }
}