From 4b838e2a64b4f441819f43fccd067c076eb422b9 Mon Sep 17 00:00:00 2001
From: liusuyi <13324259@qq.com>
Date: 星期三, 26 七月 2023 22:47:15 +0800
Subject: [PATCH] 修改用户关联报警类型
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 88 +++++++++++++++++++++++---------------------
1 files changed, 46 insertions(+), 42 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
index 27a9858..d4aadf0 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -455,49 +455,53 @@
carList31 = sYClient.getCarList1(syURL,teamId, result.get("userId"),result.get("sessionId"));
//鎷垮埌杞﹁締鏁版嵁
list= (List) carList31.get("list");
- List<String> carIdList = new ArrayList();
- //鎵�鏈塩arId
- for(Map<String,String> m : list){
- carIdList.add(m.get("carId"));
- }
- if(carIdList.size() == 0){
- Map<String,String> map0 = new HashMap();
- map0.put("list", "{}");
- map0.put("rspCode", "1");
- list.add(map0);
+ if(list.isEmpty()){
return list;
- }
- //娣诲姞杞﹁締灞炴��
- for(Map<String,String> m : list){
- switch (m.get("state")) {
- case "1":
- m.put("carState", "绂荤嚎-浠庢湭鎶ュ畾浣�");break;
- case "2":
- m.put("carState", "绂荤嚎-娆犺垂");break;
- case "3":
- m.put("carState", "绂荤嚎");break;
- case "4":
- m.put("carState", "绂荤嚎-鎶ヨ");break;
- case "5":
- m.put("carState", "鍦ㄧ嚎-浠庢湭鎶ュ畾浣�");break;
- case "6":
- m.put("carState", "鍦ㄧ嚎-娆犺垂");break;
- case "7":
- m.put("carState", "鍦ㄧ嚎-琛岄┒");break;
- case "8":
- m.put("carState", "鍦ㄧ嚎-琛岄┒-鎶ヨ");break;
- case "9":
- m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC鍏�");break;
- case "10":
- m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC寮�");break;
- case "11":
- m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC鍏�-鎶ヨ");break;
- case "12":
- m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC寮�-鎶ヨ");break;
- case "13":
- m.put("carState", "鍦ㄧ嚎-鏃犳晥瀹氫綅");break;
- default:
- break;
+ }else {
+ List<String> carIdList = new ArrayList();
+ //鎵�鏈塩arId
+ for(Map<String,String> m : list){
+ carIdList.add(m.get("carId"));
+ }
+ if(carIdList.size() == 0){
+ Map<String,String> map0 = new HashMap();
+ map0.put("list", "{}");
+ map0.put("rspCode", "1");
+ list.add(map0);
+ return list;
+ }
+ //娣诲姞杞﹁締灞炴��
+ for(Map<String,String> m : list){
+ switch (m.get("state")) {
+ case "1":
+ m.put("carState", "绂荤嚎-浠庢湭鎶ュ畾浣�");break;
+ case "2":
+ m.put("carState", "绂荤嚎-娆犺垂");break;
+ case "3":
+ m.put("carState", "绂荤嚎");break;
+ case "4":
+ m.put("carState", "绂荤嚎-鎶ヨ");break;
+ case "5":
+ m.put("carState", "鍦ㄧ嚎-浠庢湭鎶ュ畾浣�");break;
+ case "6":
+ m.put("carState", "鍦ㄧ嚎-娆犺垂");break;
+ case "7":
+ m.put("carState", "鍦ㄧ嚎-琛岄┒");break;
+ case "8":
+ m.put("carState", "鍦ㄧ嚎-琛岄┒-鎶ヨ");break;
+ case "9":
+ m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC鍏�");break;
+ case "10":
+ m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC寮�");break;
+ case "11":
+ m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC鍏�-鎶ヨ");break;
+ case "12":
+ m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC寮�-鎶ヨ");break;
+ case "13":
+ m.put("carState", "鍦ㄧ嚎-鏃犳晥瀹氫綅");break;
+ default:
+ break;
+ }
}
}
return list;
--
Gitblit v1.9.3