From c503c5d336b7219c1bff1f59b4176e4e49f2c3f2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 14 十二月 2023 13:50:21 +0800
Subject: [PATCH] 清淤
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
index 2eab8d3..451b9c0 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
@@ -248,15 +248,17 @@
@Override
public AjaxResult seal(RtuTypeParam rtuTypeParam) {
QueryWrapper<ArdSyCarRtu> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("carId",rtuTypeParam.getCarId());
+ queryWrapper.eq("car_id",rtuTypeParam.getCarId());
ArdSyCarRtu ardSyCarRtu = rtuMapper.selectOne(queryWrapper);
//1瑙ｅ皝
if(rtuTypeParam.getType()==1){
- Map<String,Object> map = new HashMap<>();
- map.put("A01", 110000);//瀵奸�氱涓�璺户鐢靛櫒
- map.put("A02", 110000);//瀵奸�氱浜岃矾缁х數鍣�
- map.put("res", String.valueOf(System.currentTimeMillis()));
- String mapString = JSON.toJSONString(map);
+// Map<String,Object> map = new HashMap<>();
+// map.put("A01", 110000);//瀵奸�氱涓�璺户鐢靛櫒
+// map.put("A02", 110000);//瀵奸�氱浜岃矾缁х數鍣�
+// map.put("res", String.valueOf(System.currentTimeMillis()));
+// String mapString = JSON.toJSONString(map);
+ String mapString = "{\"A01\":110000,\"A02\":110000,\"res\":\""+String.valueOf(System.currentTimeMillis())+"\"}";
+ log.debug("瑙ｅ皝锛�"+mapString);
EmqClient emqClient = new EmqClient(rtuTypeParam.getCarId()+"mqttPublish"+UUID.randomUUID());
emqClient.connect();
emqClient.publish(ardSyCarRtu.getTopicPublish(),mapString, QosEnum.QoS2,false);
@@ -283,10 +285,12 @@
}else if(currents.equals("C02")){
key = "D04";
}
- Map<String,Object> map = new HashMap();
- map.put(key, 0.01);
- map.put("res", String.valueOf(System.currentTimeMillis()));
- String mapString = JSON.toJSONString(map);
+// Map<String,Object> map = new HashMap();
+// map.put(key, 0.01);
+// map.put("res", String.valueOf(System.currentTimeMillis()));
+// String mapString = JSON.toJSONString(map);
+ String mapString = "{\""+key+"\":0.01,\"res\":\""+String.valueOf(System.currentTimeMillis())+"\"}";
+ log.debug("鍏抽攣锛�"+mapString);
EmqClient emqClient = new EmqClient(rtuTypeParam.getCarId()+"mqttPublish"+UUID.randomUUID());
emqClient.connect();
emqClient.publish(ardSyCarRtu.getTopicPublish(),mapString, QosEnum.QoS2,false);
@@ -302,11 +306,13 @@
}
}
if(lockCloseNum == 2){
- Map<String,Object> map = new HashMap<>();
- map.put("A01", 100000);//鏂紑绗竴璺户鐢靛櫒
- map.put("A02", 100000);//鏂紑绗簩璺户鐢靛櫒
- map.put("res", String.valueOf(System.currentTimeMillis()));
- String mapString = JSON.toJSONString(map);
+// Map<String,Object> map = new HashMap<>();
+// map.put("A01", 100000);//鏂紑绗竴璺户鐢靛櫒
+// map.put("A02", 100000);//鏂紑绗簩璺户鐢靛櫒
+// map.put("res", String.valueOf(System.currentTimeMillis()));
+// String mapString = JSON.toJSONString(map);
+ String mapString = "{\"A01\":100000,\"A02\":100000,\"res\":\""+String.valueOf(System.currentTimeMillis())+"\"}";
+ System.out.println("鏂藉皝锛�"+mapString);
EmqClient emqClient = new EmqClient(rtuTypeParam.getCarId()+"mqttPublish"+UUID.randomUUID());
emqClient.connect();
emqClient.publish(ardSyCarRtu.getTopicPublish(),mapString, QosEnum.QoS2,false);
@@ -325,7 +331,7 @@
ArdSyCarLock ardSyCarLock = lockMapper.selectById(lockTypeParam.getLockId());
Integer relay = ardSyCarLock.getRelayInfo();
if(relay!=null){
- if(relay.equals("1")){
+ if(relay.equals(1)){
return AjaxResult.error(0,"璇ラ攣澶勪簬瑙ｅ皝鐘舵��,杩滅▼鏃犳硶鎿嶆帶,璇峰厛鎵ц鏂藉皝鎿嶄綔!");
}
}
@@ -344,11 +350,12 @@
}else{
lockState = lockState + 0.01;
}
- Map<String,Object> map = new HashMap();
- map.put(key, lockState);//鑼冨洿鏄�0.01鍒�99.99
- map.put("res", String.valueOf(System.currentTimeMillis()));
- String mapString = JSON.toJSONString(map);
- System.out.println(mapString);
+// Map<String,Object> map = new HashMap();
+// map.put(key, lockState);//鑼冨洿鏄�0.01鍒�99.99
+// map.put("res", String.valueOf(System.currentTimeMillis()));
+// String mapString = JSON.toJSONString(map);
+ String mapString = "{\""+key+"\":"+lockState+",\"res\":\""+String.valueOf(System.currentTimeMillis())+"\"}";
+ log.debug("寮�鍏抽攣锛�"+mapString);
EmqClient emqClient = new EmqClient(lockTypeParam.getCarId()+"mqttPublish"+UUID.randomUUID());
emqClient.connect();
emqClient.publish(ardSyCarRtu.getTopicPublish(),mapString, QosEnum.QoS2,false);
--
Gitblit v1.9.3