forked from moral

parent: 8972b8b4 | patch | commit | ignore whitespace
cjl
2023-10-07 eb6e87a5488a83cc9e216a0f598a66af1e8cbcb2 
ci:补充提交
2 files modified
85 ■■■■■ changed files
screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java 42 ●●●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java 43 ●●●●● patch | view | raw | blame | history 
 screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java


@@ -1,27 +1,19 @@


package com.moral.api.controller;






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;


import org.springframework.web.bind.annotation.CrossOrigin;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;




import java.util.List;


import java.util.Map;




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


@@ -35,19 +27,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();


@@ -56,12 +48,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);


@@ -70,12 +63,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());


        }


@@ -89,8 +83,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);


    }


}




 screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java


@@ -1,31 +1,5 @@


package com.moral.api.service.impl;




import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.data.redis.core.RedisTemplate;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.util.ObjectUtils;


import org.springframework.web.context.request.RequestContextHolder;


import org.springframework.web.context.request.ServletRequestAttributes;




import java.util.ArrayList;


import java.util.Collection;


import java.util.Date;


import java.util.HashMap;


import java.util.List;


import java.util.Map;


import java.util.Objects;


import java.util.concurrent.TimeUnit;


import java.util.regex.Matcher;


import java.util.regex.Pattern;


import java.util.stream.Collectors;




import javax.servlet.http.HttpServletRequest;




import com.alibaba.fastjson.JSON;


import com.alibaba.fastjson.JSONArray;


import com.alibaba.fastjson.JSONObject;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.moral.api.entity.ManageAccount;


@@ -36,11 +10,24 @@


import com.moral.api.pojo.redisBean.AccountInfoDTO;


import com.moral.api.service.ManageCoordinateDetailService;


import com.moral.api.util.RoadUtils;


import com.moral.constant.Constants;


import com.moral.constant.RedisConstants;


import com.moral.util.DateUtils;


import com.moral.util.TokenUtils;


import com.sun.org.apache.regexp.internal.RE;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.data.redis.core.RedisTemplate;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.util.ObjectUtils;


import org.springframework.web.context.request.RequestContextHolder;


import org.springframework.web.context.request.ServletRequestAttributes;




import javax.servlet.http.HttpServletRequest;


import java.util.*;


import java.util.concurrent.TimeUnit;


import java.util.regex.Matcher;


import java.util.regex.Pattern;


import java.util.stream.Collectors;






@Service