From 06842b9c367083c3bf77b8b54a1e1a32b68a2e5e Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 06 七月 2024 09:02:33 +0800
Subject: [PATCH] 电磁锁分页bug修改提交
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarRtuServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarRtuServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarRtuServiceImpl.java
index 9536d9b..1b4a7e1 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarRtuServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarRtuServiceImpl.java
@@ -1,15 +1,19 @@
package com.ruoyi.sy.service.impl;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.core.domain.entity.SysConfig;
+import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.sy.domain.ArdSyCarRtu;
import com.ruoyi.sy.mapper.ArdSyCarRtuMapper;
import com.ruoyi.sy.service.ArdSyCarRtuService;
+import com.ruoyi.system.mapper.SysConfigMapper;
+import com.ruoyi.utils.mqtt.MqttConsumer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import javax.annotation.Resource;
+import java.util.*;
/**
* @author Administrator
@@ -19,16 +23,22 @@
@Autowired
private ArdSyCarRtuMapper ardSyCarRtuMapper;
+ @Resource
+ private SysConfigMapper configMapper;
@Override
- public String allCarTopic() {
+ public String[] allCarTopic() {
List<ArdSyCarRtu> carRtus = ardSyCarRtuMapper.selectList(null);
List<String> list = new ArrayList<>();
for (int i = 0; i < carRtus.size(); i++) {
list.add(carRtus.get(i).getTopicPublish());
}
- String[] topicArray = list.toArray(new String[list.size()]);
- return Arrays.toString(topicArray);
+ return list.toArray(new String[list.size()]);
+ }
+
+ @Override
+ public List<ArdSyCarRtu> allCarTopicList() {
+ return ardSyCarRtuMapper.selectList(null);
}
@Override
@@ -38,4 +48,34 @@
return ardSyCarRtuMapper.selectOne(queryWrapper);
}
+ @Override
+ public String openLock(ArdSyCarRtu ardSyCarRtu) {
+ Map<String,Object> map = new HashMap<>();
+// map.put("A01", 110000);//瀵奸�氱涓�璺户鐢靛櫒
+// map.put("A02", 110000);//瀵奸�氱浜岃矾缁х數鍣�
+ map.put("res", String.valueOf(System.currentTimeMillis()));
+ MqttConsumer.publish(ardSyCarRtu.getTopicSubscribe(), String.valueOf(new JSONObject(map)));
+ return "宸插彂閫佸紑閿佹寚浠�";
+ }
+
+ @Override
+ public ArdSyCarRtu subscribeByCarId(String subscribe) {
+ QueryWrapper<ArdSyCarRtu> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("topic_subscribe",subscribe);
+ return ardSyCarRtuMapper.selectOne(queryWrapper);
+ }
+
+ @Override
+ public String url(String key) {
+// QueryWrapper<SysConfig> queryWrapper = new QueryWrapper<>();
+// queryWrapper.eq("config_key",key);
+// SysConfig sysConfig = configMapper.selectOne(queryWrapper);
+ SysConfig sysConfig = configMapper.checkConfigKeyUnique(key);
+ if(sysConfig!=null){
+ return sysConfig.getConfigValue();
+ }else {
+ return "閰嶇疆琛ㄦ棤鍦板潃鏁版嵁";
+ }
+ }
+
}
--
Gitblit v1.9.3