From 783272d17be7fce92808bd9fb99f9d64f450bfc9 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 11 七月 2024 14:24:11 +0800
Subject: [PATCH] 添加三一车辆透传订阅提交

---
 ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java |   47 ++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 40 insertions(+), 7 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 4bd854e..00c1e59 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
@@ -13,7 +13,9 @@
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.sy.gps31.PushClientImplSerialPort;
 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 +73,9 @@
     @Autowired
     private ISysDeptService sysDeptService;
 
+    @Autowired
+    private IArdTankAbnormalParkAlarmService ardTankAbnormalParkAlarmService;
+
     @Resource
     private SYClient sYClient;
 
@@ -78,6 +83,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 +112,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();
 
@@ -113,11 +125,19 @@
                 ardSyCarService.sendArdSyCarPosition();
             }
         };
-        carPositionTimer.scheduleAtFixedRate(carPositionTask,date,3*1000);//鍚敤
-        //杞﹁締瀹炴椂浣嶇疆绾跨▼
-        PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
+        //carPositionTimer.scheduleAtFixedRate(carPositionTask,date,3*1000);//寮冪敤
+        //杞﹁締瀹炴椂鎶ヨ绾跨▼
+        //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();
+
+        PushClientImplSerialPort pushClientImplSerialPort = new PushClientImplSerialPort(ip,userId,password);
+        Thread pushClientImplSerialPortThread = new Thread(pushClientImplSerialPort);
+        pushClientImplSerialPortThread.start();
+
+        //鍒犻櫎缁撴潫鏃堕棿涓簄ull鐨勮褰�
+        int result = ardTankAbnormalParkAlarmService.deleteArdTankAbnormalParkAlarmByEndTime();
     }
 
     /**
@@ -188,7 +208,7 @@
      */
     @PreAuthorize("@ss.hasPermi('sy:syCar:remove')")
     @Log(title = "涓変竴杞﹁締", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @DeleteMapping("/{ids}")
     @ApiOperation("鍒犻櫎涓変竴杞﹁締")
     public AjaxResult remove(@PathVariable String[] ids)
     {
@@ -326,7 +346,7 @@
         }
     }
 
-//    @PreAuthorize("@ss.hasPermi('sy:syCar:carListById')")
+    //    @PreAuthorize("@ss.hasPermi('sy:syCar:carListById')")
     @PostMapping("/carListById/{id}")
     @ApiOperation("鏍规嵁杞﹁締ID鑾峰彇杞﹁締鍒楄〃")
     public Results carListById(@PathVariable String id){
@@ -369,7 +389,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()));
@@ -478,4 +498,17 @@
         return AjaxResult.success(mapDetail);
     }
 
+    @GetMapping("/getOnlineSYCarPosition")
+    @ApiOperation("鍗曞叺绔煡鐪嬪凡閫氳繃瀹℃壒鐨勫湪绾夸笁涓�杞﹁締浣嶇疆")
+    public AjaxResult getOnlineSYCarPosition() {
+        String soilderId = SecurityUtils.getUserId();
+        try{
+            Map<String,Object> result = ardSyCarService.getOnlineSYCarPosition(soilderId);
+            return AjaxResult.success(result);
+        }catch(Exception e){
+            e.printStackTrace();
+            return AjaxResult.error();
+        }
+    }
+
 }

--
Gitblit v1.9.3