aijinhui
2023-12-13 98d0a71132915ab20f6d4ade6164a21aa16001ba
飞机
已修改3个文件
18 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/utils/qymqtt/newM/EmqClient.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java
@@ -78,7 +78,7 @@
            /*String carName = MapUtil.getStrVal(gpsMap, "carName","");//获取车牌号
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            System.out.println(sdf.format(new Date()));*/
            log.info(String.format("   ---->收到定位数据:%s",JSON.toJSONString(gpsMap)));
//            log.info(String.format("   ---->收到定位数据:%s",JSON.toJSONString(gpsMap)));
            String carId = (String)gpsMap.get("carId");
            ((ArdSyCarDayServiceImpl)SpringUtils.getBean("ardSyCarDayServiceImpl")).insertArdSyCarDay(carId);//新增车辆上报时间
@@ -95,7 +95,7 @@
                    String carModel = (String) result.get("carModel");//获取车辆模型
                    Integer drct = (Integer) gpsMap.get("drct");//获取车辆模型
                    Integer speed = (Integer) gpsMap.get("speed");
                    log.info("carId:"+carId+"lng:"+lng+"lat:"+lat);
//                    log.info("carId:"+carId+"lng:"+lng+"lat:"+lat);
                    //定义2维空间
                    Point2D.Double point = new Point2D.Double(Double.parseDouble(lng), Double.parseDouble(lat));
                    List<Point2D.Double> pts = new ArrayList<Point2D.Double>();
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
@@ -69,8 +69,8 @@
        ArdSyCarRtu ardSyCarRtu = new ArdSyCarRtu();
        ardSyCarRtu.setId(String.valueOf(UUID.randomUUID()));
        ardSyCarRtu.setCarId(addRtuParam.getCarId());
        ardSyCarRtu.setTopicPublish("/p"+addRtuParam.getCarId()+"/");
        ardSyCarRtu.setTopicSubscribe("/p"+addRtuParam.getCarId()+"/set/");
        ardSyCarRtu.setTopicPublish("/p"+addRtuParam.getCarId()+"/set/");
        ardSyCarRtu.setTopicSubscribe("/p"+addRtuParam.getCarId()+"/");
        ardSyCarRtu.setInstallType(addRtuParam.getInstallType());
        ardSyCarRtu.setUnloadType(addRtuParam.getUnloadType());
        int num = rtuMapper.insert(ardSyCarRtu);
@@ -324,8 +324,10 @@
        ArdSyCarRtu ardSyCarRtu = rtuMapper.selectOne(queryWrapper);
        ArdSyCarLock ardSyCarLock = lockMapper.selectById(lockTypeParam.getLockId());
        Integer relay = ardSyCarLock.getRelayInfo();
        if(relay.equals("1")){
            return AjaxResult.error(0,"该锁处于解封状态,远程无法操控,请先执行施封操作!");
        if(relay!=null){
            if(relay.equals("1")){
                return AjaxResult.error(0,"该锁处于解封状态,远程无法操控,请先执行施封操作!");
            }
        }
        String key = "";
        String currents = ardSyCarLock.getCurrents();
ard-work/src/main/java/com/ruoyi/utils/qymqtt/newM/EmqClient.java
@@ -27,9 +27,6 @@
            this.mqttClient = new MqttClient(mqttUrl,clientId,mempersitence);//设置连接broker的host及clientId
            this.messageCallback = new MessageCallback();
        } catch (MqttException e) {
            System.out.println("初始化客户端mqttClient对象失败");
            System.out.println("brokerUrl:"+mqttUrl);
            System.out.println("clientId:"+clientId);
            e.getMessage();
        }
    }
@@ -42,7 +39,6 @@
        options.setUserName("admin");
        options.setPassword("xzx12345".toCharArray());
        options.setCleanSession(true);//设置为临时会话
        mqttClient.setCallback(messageCallback);//设置回调
        try {