Merge branch 'cjl' into qa

cjl

2023-10-07 8b5439ba2748f91720975f73e7479a751d6a452b

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

@@ -43,8 +43,11 @@
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        Integer integer = manageCoordinateDetailService.insertCoordinate(params);
        if (integer==null){
        if (integer==1){
            return ResultMessage.ok("经纬度已存在");
        }
        if (integer==2){
            return ResultMessage.ok("经纬度不存在");
        }
        return ResultMessage.ok();
    }
@@ -64,9 +67,11 @@
        if (!params.containsKey("coordinateId") || !params.containsKey("time1")|| !params.containsKey("time2")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }


        return null;
        Integer integer = manageCoordinateDetailService.batchAll(params);
        if (integer!=200){
            return ResultMessage.ok("操作失败");
        }
         return ResultMessage.ok(integer);
    }

    /**
@@ -80,26 +85,12 @@
    }


    /**
     * 删除经纬度点
     * @param id
     * @return
     */
    @GetMapping("delete")
    public ResultMessage delete(Integer id){
        if (id==null){
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        manageCoordinateDetailService.deleteCoordinate(id);
        return ResultMessage.ok();
    }


    /**
     * 查询坐标点
     * @return
     */
    @GetMapping("select")
    @PostMapping("select")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
            @ApiImplicitParam(name = "coordinateId", value = "路段id", required = true, paramType = "query", dataType = "String"),
@@ -107,10 +98,10 @@
            @ApiImplicitParam(name = "time2", value = "时间，2021-08-18", required = true, paramType = "query", dataType = "String")
    })
    public ResultMessage selectAll(@RequestBody Map<String,Object> params){
        if (!params.containsKey("coordinateId") || !params.containsKey("time1")|| !params.containsKey("time2")) {
        if (!params.containsKey("coordinateId") || !params.containsKey("time1")|| !params.containsKey("time2")|| !params.containsKey("mac")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        Map<String, Object> map = manageCoordinateDetailService.selectCoordinate(params);
        return null;
        Map<String,Object> rsMap = manageCoordinateDetailService.selectCoordinate(params);
        return ResultMessage.ok(rsMap);
    }
}