Explorar o código

司机确认添加日志

fanzherong_v hai 1 semana
pai
achega
d8e3712e39

+ 13 - 2
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/record/service/impl/BizRecordServiceImpl.java

@@ -596,8 +596,12 @@ public class BizRecordServiceImpl extends ServiceImpl<BizRecordMapper, BizRecord
     @Override
     @Override
     public void updateDriverSign(BizRecordEditParam bizRecordEditParam) {
     public void updateDriverSign(BizRecordEditParam bizRecordEditParam) {
         BizRecord bizRecord = this.queryEntity(bizRecordEditParam.getId());
         BizRecord bizRecord = this.queryEntity(bizRecordEditParam.getId());
+        log.info("司机确认开始---当前过磅记录id:"+bizRecord.getRelationId()+",车牌号:"+bizRecord.getLicensePlate());
         if(ObjectUtil.isNotEmpty(bizRecord.getAppointmentId())){
         if(ObjectUtil.isNotEmpty(bizRecord.getAppointmentId())){
             BizAppointmentRecord appointmentRecord = bizAppointmentRecordService.getById(bizRecord.getAppointmentId());
             BizAppointmentRecord appointmentRecord = bizAppointmentRecordService.getById(bizRecord.getAppointmentId());
+            if(ObjectUtil.isNotNull(appointmentRecord)){
+                log.info("司机确认当前过磅记录id:"+bizRecord.getRelationId()+",车牌号:"+bizRecord.getLicensePlate()+",状态:"+appointmentRecord.getStatus());
+            }
             if(ObjectUtil.isNotNull(appointmentRecord) && ObjectUtil.isNotEmpty(appointmentRecord.getOverId())){
             if(ObjectUtil.isNotNull(appointmentRecord) && ObjectUtil.isNotEmpty(appointmentRecord.getOverId())){
                 //查询超限重量
                 //查询超限重量
                 BizExcessConfig excessConfig = bizExcessConfigService.getById(appointmentRecord.getOverId());
                 BizExcessConfig excessConfig = bizExcessConfigService.getById(appointmentRecord.getOverId());
@@ -628,7 +632,7 @@ public class BizRecordServiceImpl extends ServiceImpl<BizRecordMapper, BizRecord
         map.put("loadUser",bizRecord.getConfirmUser());
         map.put("loadUser",bizRecord.getConfirmUser());
         //mqtt发送过磅记录id给地磅端,告诉地磅端可打印磅单,抬道闸
         //mqtt发送过磅记录id给地磅端,告诉地磅端可打印磅单,抬道闸
         mqttSubscribeClient.publishMessage(commonProperties.getMqttTopic(), JSONObject.toJSONString(map));
         mqttSubscribeClient.publishMessage(commonProperties.getMqttTopic(), JSONObject.toJSONString(map));
-        log.info("司机确认mqtt下发车牌号:"+bizRecord.getLicensePlate());
+        log.info("司机确认mqtt下发过磅记录id:"+bizRecord.getRelationId()+"车牌号:"+bizRecord.getLicensePlate());
     }
     }
 
 
     @Transactional
     @Transactional
@@ -636,10 +640,12 @@ public class BizRecordServiceImpl extends ServiceImpl<BizRecordMapper, BizRecord
         BizRecord bizRecord = this.getOne(new QueryWrapper<BizRecord>().lambda().
         BizRecord bizRecord = this.getOne(new QueryWrapper<BizRecord>().lambda().
                 eq(BizRecord::getRelationId, bizRecordEditParam.getId()).
                 eq(BizRecord::getRelationId, bizRecordEditParam.getId()).
                 last("limit 1"));
                 last("limit 1"));
+        log.info("mqtt回调开始---");
         if(ObjectUtil.isNotNull(bizRecord)){
         if(ObjectUtil.isNotNull(bizRecord)){
             //修改预约记录状态
             //修改预约记录状态
             BizAppointmentRecord appointmentRecord = bizAppointmentRecordService.getById(bizRecord.getAppointmentId());
             BizAppointmentRecord appointmentRecord = bizAppointmentRecordService.getById(bizRecord.getAppointmentId());
             if(ObjectUtil.isNotNull(appointmentRecord)){
             if(ObjectUtil.isNotNull(appointmentRecord)){
+                log.info("mqtt回调开始:过磅记录id:"+bizRecord.getRelationId()+",车牌号:"+bizRecord.getLicensePlate()+",状态:"+appointmentRecord.getStatus());
                 BizConfig bizConfig = bizConfigService.getOne(new QueryWrapper<BizConfig>().lambda().last("limit 1"));
                 BizConfig bizConfig = bizConfigService.getOne(new QueryWrapper<BizConfig>().lambda().last("limit 1"));
                 if(StringUtils.equals(bizConfig.getAccessControlSwitch(),"1")){
                 if(StringUtils.equals(bizConfig.getAccessControlSwitch(),"1")){
                     //开启门禁校验
                     //开启门禁校验
@@ -657,8 +663,13 @@ public class BizRecordServiceImpl extends ServiceImpl<BizRecordMapper, BizRecord
                 bizOrder.setNetWeight(bizOrder.getNetWeight().add(bizRecord.getNetWeight()));
                 bizOrder.setNetWeight(bizOrder.getNetWeight().add(bizRecord.getNetWeight()));
                 bizOrderService.updateById(bizOrder);
                 bizOrderService.updateById(bizOrder);
             }
             }
-        }
 
 
+            if(ObjectUtil.isNotNull(appointmentRecord)){
+                log.info("mqtt回调结束:过磅记录id:"+bizRecord.getRelationId()+",车牌号:"+bizRecord.getLicensePlate()+",状态:"+appointmentRecord.getStatus());
+            }
+
+        }
+        log.info("mqtt回调结束");
     }
     }
 
 
     @Transactional
     @Transactional