init

liusuyi

2024-10-10 38f29e38fcc668171dc05c53d40a36b895c86102

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

@@ -18,15 +18,13 @@
import com.ruoyi.sy.domain.ArdTankLock;
import com.ruoyi.sy.gps31.PushClientImplSerialPort;
import com.ruoyi.sy.param.ArdSyCarParam;
import com.ruoyi.sy.service.IArdTankAbnormalParkAlarmService;
import com.ruoyi.sy.service.IArdTankLockService;
import com.ruoyi.sy.service.*;
import com.ruoyi.sy.service.impl.ArdTankLockServiceImpl;
import com.ruoyi.sy.vo.ArdSyCarVo;
import com.ruoyi.sy.domain.ArdSyUser;
import com.ruoyi.sy.gps31.PositionContainer;
import com.ruoyi.sy.gps31.PushClientImplAlarm;
import com.ruoyi.sy.gps31.PushClientImplPosition;
import com.ruoyi.sy.service.IArdSyUserService;
import com.ruoyi.common.core.domain.entity.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
@@ -49,7 +47,6 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.sy.domain.ArdSyCar;
import com.ruoyi.sy.service.IArdSyCarService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.web.multipart.MultipartFile;

@@ -89,6 +86,9 @@

    @Autowired
    private IArdTankLockService ardTankLockService;

    @Autowired
    private IArdTankWallTemporaryService ardTankWallTemporaryService;

    @Resource
    private SYClient sYClient;
@@ -214,7 +214,10 @@
                            };
                            //lockThread.start();
                            //将状态线程放入容器
                            PositionContainer.getCarLockProcessThreadMap().get(ardTankLock.getCarId()).get(ardTankLock.getLockNum()).put("lockState",lockThread);
                            if(PositionContainer.getCarLockProcessThreadMap().get(ardTankLock.getCarId()).get(ardTankLock.getLockNum()).get("lockState") == null){
                                PositionContainer.getCarLockProcessThreadMap().get(ardTankLock.getCarId()).get(ardTankLock.getLockNum()).put("lockState",lockThread);
                            }

                        }
                    }
                };
@@ -306,7 +309,9 @@
                        }
                    };
                    //lockThread.start();
                    PositionContainer.getCarLockProcessThreadMap().get(ardTankLock.getCarId()).get(ardTankLock.getLockNum()).put("lockTime",lockThread);
                    if(PositionContainer.getCarLockProcessThreadMap().get(ardTankLock.getCarId()).get(ardTankLock.getLockNum()).get("lockTime") == null){
                        PositionContainer.getCarLockProcessThreadMap().get(ardTankLock.getCarId()).get(ardTankLock.getLockNum()).put("lockTime",lockThread);
                    }
                }
            }
        };
@@ -409,7 +414,9 @@
                                        }
                                    };
                                    //lockThread.start();
                                    PositionContainer.getCarLockProcessThreadMap().get(ardTankLock.getCarId()).get(ardTankLock.getLockNum()).put("lockRestart",lockThread);
                                    if(PositionContainer.getCarLockProcessThreadMap().get(ardTankLock.getCarId()).get(ardTankLock.getLockNum()).get("lockRestart") == null){
                                        PositionContainer.getCarLockProcessThreadMap().get(ardTankLock.getCarId()).get(ardTankLock.getLockNum()).put("lockRestart",lockThread);
                                    }
                                }
                            }
                        }
@@ -495,6 +502,8 @@
        };
        mainLockTimer.scheduleAtFixedRate(mainLockTask,date,2000);

        //异常重启重建未到期临时电子围栏线程
        ardTankWallTemporaryService.restartArdTankWallTemporaryThread(userId, password);
    }

    /**
@@ -600,7 +609,7 @@
    /**
     * 获取未挂接权限的三一车辆
     */
//    @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarNoRight')")
    @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarNoRight')")
    @PostMapping("/getArdSyCarNoRight")
    @ApiOperation("获取未挂接权限的三一车辆")
    public Map<String,Object> getArdSyCarNoRight(){
@@ -618,7 +627,7 @@
    /**
     * 获取全部的三一车辆
     */
//    @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarAll')")
    @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarAll')")
    @PostMapping("/getArdSyCarAll")
    @ApiOperation("获取全部的三一车辆")
    public Map<String,Object> getArdSyCarAll(){
@@ -636,7 +645,7 @@
    /**
     * 获取全部车辆模型
     */
//    @PreAuthorize("@ss.hasPermi('sy:syCar:getAllCarModel')")
    @PreAuthorize("@ss.hasPermi('sy:syCar:getAllCarModel')")
    @PostMapping("/getAllCarModel")
    @ApiOperation("获取全部车辆模型")
    public Map<String,Object> getAllCarModel(){
@@ -703,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){