Merge branch 'cjl' into qa

cjl

2023-10-07 8b5439ba2748f91720975f73e7479a751d6a452b

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

@@ -2,7 +2,6 @@


import io.swagger.annotations.Api;
import javafx.scene.input.Mnemonic;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Update;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,34 +17,43 @@

import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.moral.api.entity.ManageCoordinate;
import com.moral.api.mapper.ManageCoordinateMapper;
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
@Api(tags = {"添加路段模块"})
@RequestMapping("coordinate")
@CrossOrigin(origins = "*", maxAge = 3600)
public class ManageCoordinateController {

    @Autowired
    private ManageCoordinateService manageCoordinateService;

    @Autowired
    private ManageCoordinateMapper manageCoordinateMapper;


    /**
     * 添加路段信息
     *
     * @param params
     * @return
     */
    @PostMapping("interCruiserRoad")
    public ResultMessage interCruiserRoad(@RequestBody Map<String,Object> params){
        if (!params.containsKey("startPoint") || !params.containsKey("endPoint")) {
    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();
@@ -54,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);
@@ -68,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());
        }
@@ -87,12 +97,8 @@
     * @return
     */
    @GetMapping("selectCruiserRoad")
    public ResultMessage selectCruiser(){
        List<ManageCoordinate> manageCoordinates = manageCoordinateService.selectCoordinate();
        if (ObjectUtils.isEmpty(manageCoordinates)){
            return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(),
                    ResponseCodeEnum.TARGET_IS_NULL.getMsg());
        }
    public ResultMessage selectCruiser(String name, String mac) {
        List<ManageCoordinate> manageCoordinates = manageCoordinateService.selectCoordinate(name, mac);
        return ResultMessage.ok(manageCoordinates);
    }
}