From cbbea55a92b178b75f58e7c468f7e8d8ae417c9d Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 11 七月 2024 13:18:38 +0800
Subject: [PATCH] 电磁锁手动操控提交
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 21 ++++++++++++++++++---
1 files changed, 18 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..d7644e2 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
@@ -14,6 +14,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.sy.param.ArdSyCarParam;
+import com.ruoyi.sy.service.IArdTankAbnormalParkAlarmService;
import com.ruoyi.sy.vo.ArdSyCarVo;
import com.ruoyi.sy.domain.ArdSyUser;
import com.ruoyi.sy.gps31.PositionContainer;
@@ -71,6 +72,9 @@
@Autowired
private ISysDeptService sysDeptService;
+ @Autowired
+ private IArdTankAbnormalParkAlarmService ardTankAbnormalParkAlarmService;
+
@Resource
private SYClient sYClient;
@@ -78,6 +82,12 @@
@Value("${syCar.enabled}")
private Boolean syCarEnabled;
+
+ @Value("${syCar.userId}")
+ private String userId;
+
+ @Value("${syCar.password}")
+ private String password;
@PostConstruct
public void init(){
@@ -101,7 +111,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,9 +126,13 @@
};
//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();
+
+ //鍒犻櫎缁撴潫鏃堕棿涓簄ull鐨勮褰�
+ int result = ardTankAbnormalParkAlarmService.deleteArdTankAbnormalParkAlarmByEndTime();
}
/**
@@ -369,7 +384,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