From d85713cca5443547a7d4646d4e80abfce136eff8 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 02 七月 2024 15:54:17 +0800
Subject: [PATCH] 电磁锁根据三一车辆主键删除提交
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
index 2df19c5..beb7e1a 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
@@ -79,6 +79,12 @@
@Value("${syCar.enabled}")
private Boolean syCarEnabled;
+ @Value("${syCar.userId}")
+ private String userId;
+
+ @Value("${syCar.password}")
+ private String password;
+
@PostConstruct
public void init(){
ardSyCarController = this;
@@ -101,7 +107,8 @@
{
return;
}
- PushClientImplPosition pushClientImplPosition = new PushClientImplPosition(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
+ //PushClientImplPosition pushClientImplPosition = new PushClientImplPosition(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
+ PushClientImplPosition pushClientImplPosition = new PushClientImplPosition(ip,userId,password);
Thread pushClientImplPositionThread = new Thread(pushClientImplPosition);
pushClientImplPositionThread.start();
@@ -115,7 +122,8 @@
};
//carPositionTimer.scheduleAtFixedRate(carPositionTask,date,3*1000);//寮冪敤
//杞﹁締瀹炴椂鎶ヨ绾跨▼
- PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
+ //PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
+ PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,userId,password);
Thread pushClientImplAlarmThread = new Thread(pushClientImplAlarm);
pushClientImplAlarmThread.start();
}
@@ -369,7 +377,7 @@
SysUser sysUser = sysUserService.selectUserById(usersId);
Map<String, Map<String,Map<String,Object>>> deptPositionMap = PositionContainer.getDeptPositionMap();
if(deptPositionMap.isEmpty()){
- return Results.succeed();
+ return Results.error("31骞冲彴鏃犺溅杈嗕綅缃繑鍥�");
}else {
// return Results.succeed(deptPositionMap.get(sysUser.getDeptId().toString()).get(map.get("carId")));
return Results.succeed(deptPositionMap.get(sysUser.getDeptId().toString()));
--
Gitblit v1.9.3