三一车辆车队查询bug修改提交

zhangnaisong

2024-07-20 adc9b922c116463d626d8b7094933278ad89e6df

三一车辆车队查询bug修改提交

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

@@ -12,10 +12,13 @@
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
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.impl.ArdTankLockServiceImpl;
import com.ruoyi.sy.vo.ArdSyCarVo;
import com.ruoyi.sy.domain.ArdSyUser;
import com.ruoyi.sy.gps31.PositionContainer;
@@ -26,6 +29,7 @@
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.impl.SysConfigServiceImpl;
import com.ruoyi.utils.forest.SYClient;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
@@ -90,6 +94,8 @@
    @Value("${syCar.password}")
    private String password;

    private Timer lockStateTimer;

    @PostConstruct
    public void init(){
        ardSyCarController = this;
@@ -131,13 +137,66 @@
        PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,userId,password);
        Thread pushClientImplAlarmThread = new Thread(pushClientImplAlarm);
        pushClientImplAlarmThread.start();

        //串口线程
        PushClientImplSerialPort pushClientImplSerialPort = new PushClientImplSerialPort(ip,userId,password);
        Thread pushClientImplSerialPortThread = new Thread(pushClientImplSerialPort);
        pushClientImplSerialPortThread.start();

        //删除结束时间为null的记录
        int result = ardTankAbnormalParkAlarmService.deleteArdTankAbnormalParkAlarmByEndTime();

        this.lockStateTimer = new Timer();//定时获取各个锁的状态
        TimerTask lockStateTask =new TimerTask(){
            @Override
            public void run(){
                Thread thread = new Thread(){
                    @Override
                    public void run() {
                        SysConfig config = new SysConfig();
                        config.setConfigKey("syCarPT");
                        List<SysConfig> sysConfigResult = ((SysConfigServiceImpl) SpringUtils.getBean("sysConfigServiceImpl")).selectConfigList(config);
                        String syURL = "";

                        if(sysConfigResult.size() == 0){
                            return;
                        }else{
                            syURL = sysConfigResult.get(0).getConfigValue();
                        }
                        String passwordMd5 = DigestUtils.md5Hex(password);
                        Map<String, Object> LogInResult = sYClient.logIn(syURL, passwordMd5, userId);
                        String sessionId = (String) LogInResult.get("sessionId");

                        String finalSyURL = syURL;

                        List<ArdTankLock> result = ((ArdTankLockServiceImpl)SpringUtils.getBean("ardTankLockServiceImpl")).getArdTankLockAll();//查询全部电磁锁
                        for(ArdTankLock ardTankLock : result){
                            Thread LockThread = new Thread(finalSyURL){
                                @Override
                                public void run() {
                                    String lockNumHead = ardTankLock.getLockNum().substring(0,2);
                                    String lockNumTail = ardTankLock.getLockNum().substring(2,4);
                                    //计算校验
                                    String checkNum = Integer.toHexString(Integer.parseInt(lockNumHead, 16) + Integer.parseInt(lockNumTail, 16) + Integer.parseInt("01", 16));

                                    if(checkNum.length() == 1){
                                        checkNum = "0" + checkNum;
                                    }else if(checkNum.length() > 2){
                                        checkNum = checkNum.substring(checkNum.length() - 2,checkNum.length());
                                    }

                                    String paramsStr = "%7B%22type%22%3A%22ff%22%2C%22dataCnt%22%3A%22" + ardTankLock.getLockNum() + "01" + checkNum + "%22%7D";

                                    sYClient.sendCmd(finalSyURL,userId,ardTankLock.getCarId(),199,"DataDownTransfer", paramsStr,sessionId);
                                }
                            };
                            LockThread.start();
                        }
                    }
                };
                thread.start();
            }
        };
        //lockStateTimer.scheduleAtFixedRate(lockStateTask,date,1000);
    }

    /**

 ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java

@@ -88,4 +88,6 @@
    public List<String> selectArdSyCarByDeptIds(@Param("deptIdList") List<Long> deptIdList);

    public ArdSyCar getArdSyTankCarByCarId(String carId);

    public long getCountByCarIdList(@Param("carIdList") List<String> carIdList);
}

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

@@ -577,12 +577,17 @@
                        continue;
                    }
                }
//                for (Map<String, Object> m : (List<Map<String, Object>>) result0.get("list")) {
//                    if (((String) m.get("teamId")).equals(((String) map.get("teamId")))) {
//                        map.put("count", Integer.parseInt((String) m.get("carNum")));
//                    }
//                }
                map.put("count", carList.size());
                List<String> carIdList = new ArrayList();//存放车队下全部车辆主键
                for(Map<String, Object> carMap : carList){
                    carIdList.add((String) carMap.get("carId"));
                }
                //map.put("count", carList.size());
                if(carIdList.size() == 0){
                    map.put("count", 0);
                }else{
                    Long count = ardSyCarMapper.getCountByCarIdList(carIdList);
                    map.put("count", count);
                }
                map.put("online", online);
                online = 0;
            }

 ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml

@@ -126,4 +126,11 @@
        inner join ard_tank_lock atl on "asc".car_id = atl.car_id
        where "asc".car_id = #{carId}
    </select>
    <select id="getCountByCarIdList" resultType="java.lang.Long">
        select count(*) from ard_sy_car "asc"
        where "asc".car_id in
        <foreach item="carId" collection="carIdList" open="(" separator="," close=")">
            #{carId}
        </foreach>
    </select>
</mapper>