zhangnaisong
2024-08-07 a59200e76cfd8795c35e021780c556c1b3fc9e7e
电磁锁超速关锁提交
已修改4个文件
32 ■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockProcessLogService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
@@ -609,7 +609,7 @@
    /**
     * 获取未挂接权限的三一车辆
     */
//    @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarNoRight')")
    @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarNoRight')")
    @PostMapping("/getArdSyCarNoRight")
    @ApiOperation("获取未挂接权限的三一车辆")
    public Map<String,Object> getArdSyCarNoRight(){
@@ -627,7 +627,7 @@
    /**
     * 获取全部的三一车辆
     */
//    @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarAll')")
    @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarAll')")
    @PostMapping("/getArdSyCarAll")
    @ApiOperation("获取全部的三一车辆")
    public Map<String,Object> getArdSyCarAll(){
@@ -645,7 +645,7 @@
    /**
     * 获取全部车辆模型
     */
//    @PreAuthorize("@ss.hasPermi('sy:syCar:getAllCarModel')")
    @PreAuthorize("@ss.hasPermi('sy:syCar:getAllCarModel')")
    @PostMapping("/getAllCarModel")
    @ApiOperation("获取全部车辆模型")
    public Map<String,Object> getAllCarModel(){
@@ -712,7 +712,7 @@
        }
    }
    //    @PreAuthorize("@ss.hasPermi('sy:syCar:carListById')")
    @PreAuthorize("@ss.hasPermi('sy:syCar:carListById')")
    @PostMapping("/carListById/{id}")
    @ApiOperation("根据车辆ID获取车辆列表")
    public Results carListById(@PathVariable String id){
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
@@ -8,6 +8,7 @@
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.sy.domain.ArdTankLockProcessLog;
import com.ruoyi.sy.domain.ArdTankWall;
import com.ruoyi.sy.service.*;
import com.ruoyi.utils.result.Results;
@@ -439,4 +440,14 @@
        dataTable.setMsg("查询成功");
        return dataTable;
    }
    /*@ApiOperation("根据车牌号导出电磁锁手动操控记录")
    @PreAuthorize("@ss.hasPermi('sy:lock:exportArdTankLockProcessLog')")
    @PostMapping("/exportArdTankLockProcessLog")
    public void exportArdTankLockProcessLog(HttpServletResponse response, ArdTankLockProcessLog ardTankLockProcessLog) {
        List<ArdTankLockProcessLog> list = ardTankLockProcessLogService.exportArdTankLockProcessLog(ardTankLockProcessLog.getCarPlate());
        ExcelUtil<ArdTankLockProcessLog> util = new ExcelUtil<ArdTankLockProcessLog>(ArdTankLockProcessLog. class);
        util.exportExcel(response, list, "罐车锁操控日志数据");
    }*/
}
ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockProcessLogService.java
@@ -67,4 +67,6 @@
    public void autoProcessArdTankLockByLockId(Map<String,Object> gpsMap);
    public Map<String,Object> getArdTankLockProcessLogByCarPlate(Map<String,Object> para);
    public List<ArdTankLockProcessLog> exportArdTankLockProcessLog(String carPlate);
}
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java
@@ -613,6 +613,17 @@
    }
    @Override
    public List<ArdTankLockProcessLog> exportArdTankLockProcessLog(String carPlate) {
        if(carPlate.equals("")){
            List<ArdTankLockProcessLog> resultList = ardTankLockProcessLogMapper.getArdTankLockProcessLogAll();
            return resultList;
        }else{
            List<ArdTankLockProcessLog> resultList = ardTankLockProcessLogMapper.getArdTankLockProcessLogByCarPlate("%" + carPlate + "%");
            return resultList;
        }
    }
    public Map<String,Object> sendCmd(String syURL,String userId,String carId,Integer cmdId,String cmd,String paramsStr,String sessionId){
        OkHttpClient okHttpClient = new OkHttpClient();