From d0ca32aff1c7f4642dbf815c22a3a1c9667097a3 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 05 十二月 2023 10:43:18 +0800
Subject: [PATCH] 清淤
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java | 93 ++++++++++++----------------------------------
1 files changed, 25 insertions(+), 68 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 26b9f4d..dca46eb 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
@@ -19,7 +19,9 @@
import com.ruoyi.sy.vo.RtuVo;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.mapper.SysDeptMapper;
-import com.ruoyi.utils.qymqtt.MqttCustomerClient;
+import com.ruoyi.utils.qymqtt.newM.EmqClient;
+import com.ruoyi.utils.qymqtt.newM.QosEnum;
+import com.ruoyi.utils.qymqtt.oldM.MqttCustomerClient;
import lombok.extern.slf4j.Slf4j;
import org.eclipse.paho.client.mqttv3.MqttException;
import org.springframework.beans.factory.annotation.Autowired;
@@ -191,7 +193,11 @@
@Override
public List<CarVo> queryCar(List<String> list) {
QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
- queryWrapper.ne("reserved_1","").notIn("car_id",list);
+ if(list.size()>0){
+ queryWrapper.ne("reserved_1","").notIn("car_id",list);
+ }else {
+ queryWrapper.ne("reserved_1","");
+ }
List<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);
return carAnalysis(ardSyCars);
}
@@ -251,15 +257,11 @@
map.put("A02", 110000);//瀵奸�氱浜岃矾缁х數鍣�
map.put("res", String.valueOf(System.currentTimeMillis()));
String mapString = JSON.toJSONString(map);
- try {
- MqttCustomerClient mqttCustomerClient = new MqttCustomerClient();
- mqttCustomerClient.connect(rtuTypeParam.getCarId()+"change");
- mqttCustomerClient.pushlish(ardSyCarRtu.getTopicPublish(),mapString);
- return AjaxResult.success("瑙ｅ皝鍛戒护鍙戦�佹垚鍔燂紒");
+ EmqClient emqClient = new EmqClient(rtuTypeParam.getCarId()+"mqttPublish"+UUID.randomUUID());
+ emqClient.connect();
+ emqClient.publish(ardSyCarRtu.getTopicPublish(),mapString, QosEnum.QoS2,false);
+ return AjaxResult.success("瑙ｅ皝鍛戒护鍙戦�佹垚鍔燂紒");
// return AjaxResult.success(mqttOnce.publishCar(rtuTypeParam.getCarId(),ardSyCarRtu.getTopicPublish(),String.valueOf(new com.alibaba.fastjson2.JSONObject(map)),"瑙ｅ皝"));
- } catch (MqttException e) {
- log.debug("瑙ｅ皝鎸囦护鍙戠敓澶辫触"+e);
- }
}
//0鏂藉皝
if(rtuTypeParam.getType()==0){
@@ -285,14 +287,10 @@
map.put(key, 0.01);
map.put("res", String.valueOf(System.currentTimeMillis()));
String mapString = JSON.toJSONString(map);
- try {
- MqttCustomerClient mqttCustomerClient = new MqttCustomerClient();
- mqttCustomerClient.connect(rtuTypeParam.getCarId()+"change");
- mqttCustomerClient.pushlish(ardSyCarRtu.getTopicPublish(),mapString);
+ EmqClient emqClient = new EmqClient(rtuTypeParam.getCarId()+"mqttPublish"+UUID.randomUUID());
+ emqClient.connect();
+ emqClient.publish(ardSyCarRtu.getTopicPublish(),mapString, QosEnum.QoS2,false);
// mqttOnce.publishCar("carId",ardSyCarRtu.getTopicPublish(),String.valueOf(new com.alibaba.fastjson2.JSONObject(map)),"寮�閿侊細"+currents);
- } catch (MqttException e) {
- log.debug("寮�閿佹寚浠ゅ彂鐢熷け璐�"+e);
- }
while(true){
ArdSyCarLock ardSyCarLock1 = getCurrentInfo(ardSyCarRtu.getId(),currents);
Double currentInfo1 = ardSyCarLock1.getCurrentInfo();
@@ -309,15 +307,11 @@
map.put("A02", 100000);//鏂紑绗簩璺户鐢靛櫒
map.put("res", String.valueOf(System.currentTimeMillis()));
String mapString = JSON.toJSONString(map);
- try {
- MqttCustomerClient mqttCustomerClient = new MqttCustomerClient();
- mqttCustomerClient.connect(rtuTypeParam.getCarId()+"change");
- mqttCustomerClient.pushlish(ardSyCarRtu.getTopicPublish(),mapString);
- return AjaxResult.success("鏂藉皝鍛戒护鍙戠敓鎴愬姛锛�");
+ EmqClient emqClient = new EmqClient(rtuTypeParam.getCarId()+"mqttPublish"+UUID.randomUUID());
+ emqClient.connect();
+ emqClient.publish(ardSyCarRtu.getTopicPublish(),mapString, QosEnum.QoS2,false);
+ return AjaxResult.success("鏂藉皝鍛戒护鍙戠敓鎴愬姛锛�");
// return AjaxResult.success(mqttOnce.publishCar(rtuTypeParam.getCarId(),ardSyCarRtu.getTopicPublish(),String.valueOf(new com.alibaba.fastjson2.JSONObject(map)),"鏂藉皝"));
- } catch (MqttException e) {
- log.debug("鏂藉皝鎸囦护鍙戠敓澶辫触"+e);
- }
}
}
return AjaxResult.success();
@@ -353,50 +347,13 @@
map.put("res", String.valueOf(System.currentTimeMillis()));
String mapString = JSON.toJSONString(map);
System.out.println(mapString);
- MqttCustomerClient mqttCustomerClient = new MqttCustomerClient();
- mqttCustomerClient.connect(lockTypeParam.getCarId()+"change"+UUID.randomUUID());
- mqttCustomerClient.pushlish(ardSyCarRtu.getTopicPublish(),mapString);
+ EmqClient emqClient = new EmqClient(lockTypeParam.getCarId()+"mqttPublish"+UUID.randomUUID());
+ emqClient.connect();
+ emqClient.publish(ardSyCarRtu.getTopicPublish(),mapString, QosEnum.QoS2,false);
+// MqttCustomerClient mqttCustomerClient = new MqttCustomerClient();
+// mqttCustomerClient.connect(lockTypeParam.getCarId()+"change"+UUID.randomUUID());
+// mqttCustomerClient.pushlish(ardSyCarRtu.getTopicPublish(),mapString);
return AjaxResult.success("寮�鍏抽攣鍛戒护鍙戦�佹垚鍔�,鍙戦�佽繘搴︿负"+lockTypeParam.getNum());
-// QueryWrapper<SysConfig> queryWrapper1 = new QueryWrapper<>();
-// queryWrapper1.eq("config_key","ElectromagneticLockUrl");
-// SysConfig sysConfig = configMapper.selectOne(queryWrapper1);
-// String url = "";
-// if(sysConfig!=null){
-// url = sysConfig.getConfigValue();
-// }else {
-// return AjaxResult.error("閰嶇疆琛ㄦ棤鍦板潃鏁版嵁");
-// }
-// MqttConsumer mqttConsumer = new MqttConsumer();
-// mqttConsumer.getClientCar(url,lockTypeParam.getCarId());
-// mqttConsumer.publishCar(1,false,ardSyCarRtu.getTopicPublish(),mapString);
-// mqttConsumer.disConnect();
-// return AjaxResult.success();
- //MqttOnce瀹㈡埛绔�-----寮�濮�
-// MqttOnce mqttOnce = new MqttOnce();
-// return AjaxResult.success(mqttOnce.publishCar("carId",ardSyCarRtu.getTopicPublish(), mapString,"寮�鍏抽攣鎸囦护"+lockTypeParam.getNum()));
- //MqttOnce瀹㈡埛绔�-----缁撴潫
- //EmqClient瀹㈡埛绔�-----寮�濮�
-// EmqClient emqClient = new EmqClient("tcp://112.98.126.2:1883",String.valueOf(UUID.randomUUID()));
-// emqClient.connect("admin","xzx12345");
-// log.info("涓婚锛�"+ardSyCarRtu.getTopicPublish());
-// emqClient.publish(ardSyCarRtu.getTopicPublish(),mapString, QosEnum.QoS2,false);
-// System.out.println("////////////////////");
-// System.out.println(mapString);
-// emqClient.disConnect();
-// return AjaxResult.success(ardSyCarRtu.getTopicPublish()+"寮�鍏抽攣鎸囦护"+lockTypeParam.getNum()+"鍙戝竷鎴愬姛锛�");
- //EmqClient瀹㈡埛绔�-----缁撴潫
- //demo------寮�濮�
-// EmqClient emqClient = new EmqClient("tcp://112.98.126.2:1883","mqttTestp");
-// emqClient.connect("admin","xzx12345");
-// Map<String,Object> map = new HashMap();
-// map.put("D03", 99.99);//鑼冨洿鏄�0.01鍒�99.99
-// map.put("res", String.valueOf(new Date().getTime()));
-// System.out.println(map);
-// String msg = JSON.toJSONString(map);
-// emqClient.publish("/p14/set/",msg,QosEnum.QoS2,false);
-// emqClient.disConnect();
-// return AjaxResult.success();
- //demo----缁撴潫
}
@Override
--
Gitblit v1.9.3