清淤管理

aijinhui

2023-10-31 e0c71e43f22a81c57720c7ab3595564c5a8e3aee

清淤管理

 ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java

@@ -1,10 +1,14 @@
package com.ruoyi.sy.controller;

import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.sy.domain.ArdAccessFence;
import com.ruoyi.sy.domain.ArdSyCarLock;
import com.ruoyi.sy.domain.ArdSyCarRtu;
import com.ruoyi.sy.domain.ArdSyUser;
import com.ruoyi.sy.mapper.ArdAccessFenceMapper;
import com.ruoyi.sy.service.ArdAccessFenceService;
import com.ruoyi.sy.service.ArdSyCarLockService;
import com.ruoyi.sy.service.IArdSyCarService;
import com.ruoyi.sy.service.IArdSyUserService;
@@ -36,6 +40,8 @@
    private IArdSyCarService ardSyCarService;
    @Autowired
    private ArdSyCarLockService ardSyCarLockService;
    @Autowired
    private ArdAccessFenceService ardAccessFenceService;

    @GetMapping("/car")
    @ApiOperation("查询所有未挂锁的车辆")
@@ -150,4 +156,23 @@
        return list;
    }

    @GetMapping("/addCar")
    @ApiOperation("清淤手动添加车辆查询")
    public AjaxResult queryCar(){
        List<ArdAccessFence> ardAccessFences = ardAccessFenceService.all();
        List<String> carIdList = new ArrayList<>();
        for (int i = 0; i < ardAccessFences.size(); i++) {
            String carId = ardAccessFences.get(i).getCarId();
            carIdList.add(carId);
        }
        List<CarVo> list = ardSyCarLockService.queryCar(carIdList);
        analysis(list);
        return AjaxResult.success(list);
    }

    @PostMapping("/addCar")
    @ApiOperation("清淤手动添加车辆保存")
    public AjaxResult queryCar(@RequestBody CarVo carVo){
        return AjaxResult.success(ardAccessFenceService.addCar(carVo));
    }
}

 ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java

@@ -4,24 +4,16 @@
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.common.utils.uuid.UUID;
import com.ruoyi.sy.domain.*;
import com.ruoyi.sy.mapper.ArdAccessNumMapper;
import com.ruoyi.sy.param.OilWallParam;
import com.ruoyi.sy.service.*;
import com.ruoyi.sy.service.impl.ArdAccessFenceServiceImpl;
import com.ruoyi.sy.service.impl.ArdOilWallServiceImpl;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.utils.gps.GeoTools;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.awt.geom.Point2D;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

@@ -35,15 +27,6 @@

    @Autowired
    private ArdOilWallService ardOilWallService;

    @Autowired
    private IArdSyCarService carService;

    @Autowired
    private IArdSyUserService iArdSyUserService;

    @Autowired
    private ISysConfigService sysConfigService;

    @Autowired
    private ArdAccessFenceService ardAccessFenceService;
@@ -81,8 +64,8 @@
    }

    @GetMapping("/query")
    @ApiOperation("查询所有电子围栏")
    public AjaxResult query(OilWallParam oilWallParam){
    @ApiOperation("条件查询所有电子围栏分页")
    public AjaxResult queryPage(OilWallParam oilWallParam){
        if(oilWallParam.getPageNum()==null || oilWallParam.getPageNum() == 0){
            oilWallParam.setPageNum(1);
        }
@@ -94,25 +77,16 @@
        return AjaxResult.success(new PageInfo<>(list));
    }

    @GetMapping("/query")
    @ApiOperation("查询所有电子围栏")
    public AjaxResult query(){
        List<ArdOilWall> list = ardOilWallService.all();
        return AjaxResult.success(list);
    }

    @GetMapping("/wallCar")
    @ApiOperation("所有进入围栏的车辆")
    public AjaxResult wallCar(){
        //查询所有已挂载的车辆
        List<ArdSyCar> carList = carService.all();
        //获取车辆位置
        String usersId = SecurityUtils.getUserId();
        ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
        String syURL = sysConfigService.getSYURL();
        for (int i = 0; i < carList.size(); i++) {
            String carId = carList.get(i).getCarId();
            carService.getCarGPSBycarId(usersId,carId,syURL,ardSyUser);
        }
        return AjaxResult.success();
    }

    @GetMapping("/accessAll")
    @ApiOperation("查询所有电子围栏")
    public AjaxResult accessAll(){
        return AjaxResult.success(ardAccessFenceService.all());
    }

@@ -122,15 +96,11 @@
        return AjaxResult.success(ardAccessNumService.queryNum());
    }

    @GetMapping("/updTime")
    @PostMapping("/updTime")
    @ApiOperation("保存时间步长")
    public AjaxResult updTime(@RequestBody ArdAccessNum ardAccessNum){
        return AjaxResult.success(ardAccessNumService.add(ardAccessNum));
    }

//    @GetMapping("/addCar")
//    @ApiOperation("手动添加车辆")
//    public AjaxResult addCar(@RequestBody ArdAccessNum ardAccessNum){
//        return AjaxResult.success();
//    }

}

 ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java

@@ -20,4 +20,6 @@
    private String intoUnloadTime;
    private String outShipmentId;
    private String outShipmentTime;
    private String isWarning;
    private String isDel;
}

 ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java

@@ -121,6 +121,9 @@
                        }
                    }
                }else {
                    //如果车辆有数据判断是否有进入围栏ID，如果没有更新或赋值经纬度，判断是否进入围栏

                    //如果有进入围栏ID，判断是否开出装油点
                    String out = ardAccessFence.getOutShipmentId();
                    if(out == null){
                        //车辆未开出装油点
@@ -169,6 +172,8 @@
                            }
                            if(isRoad){
                                //如果在路上需要记录每次坐标与上次是否相同，如果一样更新停留时间


                            }
                        }else {
                            //车辆已经进入卸油点，判断是否已经开出卸油点

 ard-work/src/main/java/com/ruoyi/sy/service/ArdAccessFenceService.java

@@ -1,6 +1,8 @@
package com.ruoyi.sy.service;

import com.ruoyi.sy.domain.ArdAccessFence;
import com.ruoyi.sy.param.OilWallParam;
import com.ruoyi.sy.vo.CarVo;

import java.util.List;

@@ -15,4 +17,6 @@
    int delAccess(String carId);

    List<ArdAccessFence> all();

    int addCar(CarVo carVo);
}

 ard-work/src/main/java/com/ruoyi/sy/service/ArdOilWallService.java

@@ -15,6 +15,7 @@
    int updOilWall(ArdOilWall ardOilWall);
    ArdOilWall one(String id);
    List<ArdOilWall> query(OilWallParam oilWallParam);
    List<ArdOilWall> all();
    List<ArdOilWall> accessAll();
    List<ArdOilWall> uploadAll();
}

 ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java

@@ -34,5 +34,6 @@
    RtuVo updRtu(String carId);
    int updRtuCar(ArdSyCarRtu ardSyCarRtu);

    List<CarVo> queryCar(List<String> list);

}

 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdAccessFenceServiceImpl.java

@@ -3,11 +3,14 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.sy.domain.ArdAccessFence;
import com.ruoyi.sy.mapper.ArdAccessFenceMapper;
import com.ruoyi.sy.param.OilWallParam;
import com.ruoyi.sy.service.ArdAccessFenceService;
import com.ruoyi.sy.vo.CarVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.UUID;

@Service
public class ArdAccessFenceServiceImpl implements ArdAccessFenceService {
@@ -52,4 +55,15 @@
        return ardAccessFenceMapper.selectList(null);
    }

    @Override
    public int addCar(CarVo carVo) {
        ArdAccessFence ardAccessFence = new ArdAccessFence();
        ardAccessFence.setId(String.valueOf(UUID.randomUUID()));
        ardAccessFence.setCarId(carVo.getCarId());
        ardAccessFence.setCarName(carVo.getCarPlate());
        ardAccessFence.setDeptId(carVo.getDeptId());
        ardAccessFence.setDeptName(carVo.getDeptName());
        return ardAccessFenceMapper.insert(ardAccessFence);
    }

}

 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdOilWallServiceImpl.java

@@ -48,6 +48,11 @@
    }

    @Override
    public List<ArdOilWall> all() {
        return ardOilWallMapper.selectList(null);
    }

    @Override
    public List<ArdOilWall> accessAll() {
        QueryWrapper<ArdOilWall> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("type","1");

 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java

@@ -163,6 +163,14 @@
        return ardSyCarMapper.updateById(ardSyCar);
    }

    @Override
    public List<CarVo> queryCar(List<String> list) {
        QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
        queryWrapper.ne("reserved_1","").ne("car_id",list);
        List<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);
        return carAnalysis(ardSyCars);
    }


    public List<CarVo> carAnalysis(List<ArdSyCar> ardSyCars){
        List<CarVo> list = new ArrayList<>();