去除MQTT log,优化设备列表接口

zhuguifei

4 天以前 1f04768f05d4a68f0f16456b7934f729dea9fb83

 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java

@@ -173,7 +173,7 @@

    @Override
    public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) {
        System.err.println("消息传递成功");
//        System.err.println("消息传递成功");
    }

    // 解析admin角色指令
@@ -198,7 +198,7 @@
        switch (topic) {
            // 查询设备在线
            case MqttConstant.MOBILE_QUERY_EQU_STATU:
                log.info("admin收到MQTT请求，topic: {}", topic);  // 改用更规范的日志记录
                //log.info("admin收到MQTT请求，topic: {}", topic);  // 改用更规范的日志记录

                try {

@@ -269,9 +269,11 @@
                        RealTimeDataParentVo vo = JSON.parseObject(message, RealTimeDataParentVo.class);
                        // 向各租户移动端发送数据
                        String recTopic = String.format(MqttConstant.SERVICE_BROADCAST_TENANT_REAL_DATA, vo.getTenantid());
                        if(vo.getRealTime() != null){
                            vo.getRealTime().setWorkorder(vo.getWorkorder());
                        }
                        MqMessage<RealTimeDataVo> mqMessage = new MqMessage<>(vo.getRealTime(), vo.getTenantid() + "", recTopic);
                        sendMqttMessage(MqttConstant.SERVICE_BROADCAST_TENANT_REAL_DATA, mqMessage, 1);


                         realTimeDataService.realTimeDataHandle(vo);

@@ -331,8 +333,8 @@
                List<DryFaultRecordVo> faultList = new ArrayList<DryFaultRecordVo>((dryFaultMap.values()));
                MqMessage<List<DryFaultRecordVo>> mqMessage = new MqMessage<>(faultList, tenantId, resTopic);
                //发送请求设备
                System.err.println("发送给：" + resTopic);
                sendMqttMessage(resTopic, mqMessage, 2);
//                System.err.println("发送给：" + resTopic);
                 sendMqttMessage(resTopic, mqMessage, 2);

            }
            break;
@@ -343,7 +345,7 @@
                        MqMessage<List<DryFaultRecord>> faultMessage = JSON.parseObject(message, new TypeReference<MqMessage<List<DryFaultRecord>>>() {
                        });
                        //   List<DryFaultRecord> faultRecords = JSON.parseArray(jsonObject.get("data").toString(), DryFaultRecord.class);
                        System.err.println(faultMessage.toString());
//                        System.err.println(faultMessage.toString());
                        faultRecordService.saveBatch(faultMessage.getData());

                    } catch (Exception e) {
@@ -405,8 +407,8 @@

        switch (topic) {
            case MqttConstant.MOBILE_REQ_EQU_CMD:
                System.err.println("user收到" + topic);
                System.err.println(message);
//                System.err.println("user收到" + topic);
//                System.err.println(message);
                ThreadUtil.execute(() -> {
                    //TODO 向PLC发送开关机操作，并返回信息
                    JSONObject res = new JSONObject();