From 77cb365302cc814df041e31e4a880d804a93383f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十二月 2024 17:19:28 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/cars/response/CarsAlarmResultListResponse.java | 18 +
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/cars/request/CarsAlarmListRequest.java | 17 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/cars/response/CarsAlarmListResponse.java | 70 +++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java | 63 ++++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 452 ++++++++++++++++++++++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 7
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardCarsListVO.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 20
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java | 8
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/cars/response/CarsEfcEventInfoResponse.java | 67 +++++
12 files changed, 709 insertions(+), 21 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
index 7db4ebd..7a6b5c6 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
@@ -71,6 +71,7 @@
BoardCarsListVO data = boardService.platformJobCarsList();
return ApiResponse.success(data);
}
+
@LoginNoRequired
@ApiOperation("鏍规嵁杞︾墝鍙锋煡璇綔涓氫俊鎭拰鍚堝悓淇℃伅闆嗗悎")
@PostMapping("/getCarsJobDetails")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
index 0d89649..c5d6947 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
@@ -36,12 +36,10 @@
@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/security")
public class SecurityController extends BaseController {
-
@Autowired
private BoardService boardService;
@Autowired
private VisitsService visitsService;
-
@LoginNoRequired
@ApiOperation("涓績鏁版嵁")
@GetMapping("/centerData")
@@ -49,7 +47,6 @@
SecurityBoardVO data = boardService.centerSecurityData();
return ApiResponse.success(data);
}
-
@LoginNoRequired
@ApiOperation("鍥尯瀹夐槻璁惧")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index a41b594..b69adcd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -1,10 +1,15 @@
package com.doumee.core.haikang.model;
+import com.doumee.core.tms.model.TMSContants;
import com.doumee.core.utils.Constants;
import javafx.scene.effect.BlendMode;
import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
@Data
public class HKConstants {
@@ -26,6 +31,453 @@
*/
public static final String ARTEMIS_PATH = "/artemis";
+ public static void main(String[] args) {
+ String t ="閲岀▼\t-30\t100\n" +
+ " 瓒呴�熸姤璀� (璁惧鍥存爮)\t-30\t8\n" +
+ " 杩涘嚭鍖哄煙/璺嚎鎶ヨ(璁惧鍥存爮)\t-30\t2\n" +
+ " 浜鸿劯鑰冨嫟\t-30\t11\n" +
+ " IC鍗¤�冨嫟\t-30\t11\n" +
+ " 浜鸿劯姣斿缁撴灉\t-30\t10\n" +
+ " 鐗规畩寮傚父鎶ヨ\t-30\t12\n" +
+ " 鍓嶅悜纰版挒鎶ヨ\t100\t1\n" +
+ " 杞﹂亾鍋忓悜鎶ヨ\t100\t2\n" +
+ " 杞﹁窛杩囪繎鎶ヨ\t100\t3\n" +
+ " 琛屼汉纰版挒鎶ヨ\t100\t4\n" +
+ " 棰戠箒鍙橀亾鎶ヨ\t100\t5\n" +
+ " 閬撹矾鏍囪瘑瓒呴檺鎶ヨ\t100\t6\n" +
+ " 閬撹矾鏍囧織瓒呴�熸姤璀t100\t16\n" +
+ " 涓诲姩鎶撴媿浜嬩欢\t100\t17\n" +
+ " 杞﹀帰杩囬亾琛屼汉妫�娴媆t100\t19\n" +
+ " 杞﹂亾鍋忕鍙砛t100\t20\n" +
+ " 杞﹂亾鍋忕宸t100\t21\n" +
+ " 璺彛鎶ヨ\t100\t30\n" +
+ " 瓒呴�熸姤璀t100\t31\n" +
+ " 鏂戦┈绾胯秴閫焅t100\t32\n" +
+ " 鏈ぜ璁╄浜篭t100\t33\n" +
+ " 杩濊鍗犻亾琛岄┒\t100\t34\n" +
+ " 闂孩鐏痋t100\t35\n" +
+ " 鐤插姵椹鹃┒鎶ヨ\t101\t1\n" +
+ " 鎺ユ墦鐢佃瘽鎶ヨ\t101\t2\n" +
+ " 鎶界儫鎶ヨ\t101\t3\n" +
+ " 鍒嗙椹鹃┒鎶ヨ\t101\t4\n" +
+ " 椹鹃┒鍛樺紓甯� (鍖呮嫭椹鹃┒鍛樼宀�)\t101\t5\n" +
+ " 閬尅\t101\t6\n" +
+ " 椹鹃┒鍛樹汉鑴歌韩浠借瘑鍒簨浠� (椹鹃┒鍛樻娴嬪紓甯革紝浜鸿劯涓嶅湪搴撲腑)\t101\t9\n" +
+ " 鏈郴瀹夊叏甯t101\t17\n" +
+ " 鏈郴瀹夊叏甯︽姤璀� 宸ョ▼杞t101\t10\n" +
+ " 绾㈠闃绘柇澧ㄩ暅\t101\t11\n" +
+ " 鍙屾墜鑴辩鏂瑰悜鐩榎t101\t18\n" +
+ " 鍗曟墜鑴辩鏂瑰悜鐩榎t101\t13\n" +
+ " 鏈埓瀹夊叏甯絓t101\t14\n" +
+ " 鑷姩鎶撴媿\t101\t16\n" +
+ " 闈炴硶鍏抽棬\t101\t29\n" +
+ " 闈炴硶寮�闂╘t101\t30\n" +
+ " 鐜╂墜鏈篭t101\t31\n" +
+ " 楗厭椹鹃┒\t101\t32\n" +
+ " 閱夐厭椹鹃┒\t101\t33\n" +
+ " 澶氫汉鑴告姤璀t101\t48\n" +
+ " 闂溂\t101\t34\n" +
+ " 鍓岮EB鎶ヨ\t101\t101\n" +
+ " 涓嶆埓鍙ｇ僵鎶ヨ\t101\t100\n" +
+ " 鑳庡帇鎶ヨ\t103\n" +
+ " 鍚庢柟鎺ヨ繎鎶ヨ\t102\t1\n" +
+ " 宸︿晶鍚庢柟鎺ヨ繎鎶ヨ\t102\t2\n" +
+ " 鍙充晶鍚庢柟鎺ヨ繎鎶ヨ\t102\t3\n" +
+ " 鍓嶅悜鎺ヨ繎鎶ヨ\t102\t4\n" +
+ " 鐤戜技闈炴硶娉ㄦ按鎶ヨ\t102\t5\n" +
+ " 鍓嶈秴澹版尝鎶ヨ\t102\t238\n" +
+ " 鍚庤秴澹版尝鎶ヨ\t102\t239\n" +
+ " 绱ф�ユ姤璀t102\t240\n" +
+ " 鎬ュ姞閫焅t104\t1\n" +
+ " 鎬ュ噺閫焅t104\t2\n" +
+ " 纰版挒\t104\t3\n" +
+ " 渚х炕\t104\t4\n" +
+ " 鎬ュ乏杞集\t104\t5\n" +
+ " 鎬ュ彸杞集\t104\t6\n" +
+ " 鎬ヨ浆寮�(涓嶅尯鍒嗗乏鍜屽彸)\t104\t7\n" +
+ " 鍓х儓棰犵案\t104\t255\n" +
+ " 娴嬫俯鎶ヨ\t170\n" +
+ " 椹鹃┒鍛樿瘉浠禱t163\t163\n" +
+ " 鍙宠浆寮秴閫焅t238\t1\n" +
+ " 鍙宠浆寮笉鍋滆溅\t238\t2\n" +
+ " 涓惧崌浜嬩欢\t172\t1\n" +
+ " 瀵嗛棴浜嬩欢\t172\t2\n" +
+ " 杞介噸浜嬩欢\t172\t3\n" +
+ " 鍓嶈鐩插尯鍒跺姩\t249 0xF9\t1\n" +
+ " 鍚庤鐩插尯鍒跺姩\t249\t2\n" +
+ " 鍓嶈秴澹版尝鍒跺姩\t249\t3\n" +
+ " 鍚庤秴澹版尝鍒跺姩\t249\t4\n" +
+ " 宸﹁鐩插尯鍒跺姩\t249\t5\n" +
+ " 鍙宠鐩插尯鍒跺姩\t249\t6\n" +
+ " 鍓岮EB鍒跺姩\t249\t7\n" +
+ " 鍓嶈鐩插尯棰勮\t249\t21\n" +
+ " 鍚庤鐩插尯棰勮\t249\t22\n" +
+ " 鍓嶈秴澹版尝棰勮\t249\t23\n" +
+ " 鍚庤秴澹版尝棰勮\t249\t24\n" +
+ " 宸﹁鐩插尯棰勮\t249\t25\n" +
+ " 鍙宠鐩插尯棰勮\t249\t26\n" +
+ " 鍓岮EB棰勮\t249\t27\n" +
+ " 涓诲姩涓婃姤鎶ヨ浜嬩欢\t160\t0\n" +
+ " 宸℃涓婃姤浜嬩欢\t160\t1\n" +
+ " 绱ф�ユ姤璀t25\t1\n" +
+ " 绱ф�ユ姤璀t-32\t0\n" +
+ " 瓒呴�熸姤璀t-32\t16\n" +
+ " 鐤插姵椹鹃┒\t-32\t32\n" +
+ " 鍗遍櫓棰勮\t-32\t33\n" +
+ " GNSS妯″潡鏁呴殰\t-32\t2\n" +
+ " GNSS澶╃嚎鏈帴鍏t-32\t3\n" +
+ " GNSS澶╃嚎鐭矾\t-32\t4\n" +
+ " 缁堢涓荤數婧愭瑺鍘媆t-32\t5\n" +
+ " 缁堢涓荤數婧愭帀鐢礬t-32\t6\n" +
+ " LCD鎴栬�呮樉绀哄睆鏁呴殰\t-32\t7\n" +
+ " TTS妯″潡鏁呴殰\t-32\t46\n" +
+ " 鎽勫儚澶存晠闅淺t-32\t9\n" +
+ " 閬撹矾杩愯緭璇両C鍗℃ā鍧楁晠闅淺t-32\t34\n" +
+ " 瓒呴�熼璀t-32\t43\n" +
+ " 鐤插姵椹鹃┒棰勮\t-32\t35\n" +
+ " 杩濊琛岄┒鎶ヨ(2019)\t-32\t45\n" +
+ " 鑳庡帇(2019)\t-32\t44\n" +
+ " 褰撳ぉ绱椹鹃┒瓒呮椂\t-32\t18\n" +
+ " 瓒呮椂鍋滆溅\t-32\t19\n" +
+ " 杩涘嚭鍖哄煙\t-32\t20\n" +
+ " 杩涘嚭璺嚎\t-32\t20\n" +
+ " 璺琛岄┒鏃堕棿涓嶈冻/杩囬暱\t-32\t21\n" +
+ " 璺嚎鍋忕鎶ヨ\t-32\t36\n" +
+ " 杞﹁締VSS鏁呴殰\t-32\t37\n" +
+ " 杞﹁締娌归噺寮傚父\t-32\t38\n" +
+ " 杞﹁締琚洍\t-32\t39\n" +
+ " 杞﹁締闈炴硶鐐圭伀\t-32\t24\n" +
+ " 杞﹁締闈炴硶浣嶇Щ\t-32\t25\n" +
+ " 纰版挒鎶ヨ\t-32\t40\n" +
+ " 渚х炕棰勮\t-32\t41\n" +
+ " 浜鸿劯閫氱煡\t-30\t13\n" +
+ " 涓婄彮鎵撳崱\t-30\t14\n" +
+ " 瀛樺偍鍣ㄦ晠闅滄姤璀t-30\t23\n" +
+ " 鍙告満鎷斾簡TF鍗t-30\t50\n" +
+ " 鍓╀綑娌归噺鐧惧垎姣擻t-30\t102\n" +
+ " 骞冲潎娌硅�梊t-30\t103\n" +
+ " 娴锋嫈楂樺害\t-30\t104\n" +
+ " 鏁忔劅璇嶄簨浠禱t-30\t900\n" +
+ " 杞藉涓嶆墦琛╘t-33\t0\n" +
+ " 绌鸿浆閲峔t-33\t2\n" +
+ " 鎬ュ姞閫焅t104\t1\n" +
+ " 鎬ュ噺閫焅t104\t2\n" +
+ " 纰版挒\t104\t3\n" +
+ " 渚х炕\t104\t4\n" +
+ " 鎬ュ乏杞集\t104\t5\n" +
+ " 鎬ュ彸杞集\t104\t6\n" +
+ " 杩濊杩愯惀鎶ヨ\t-33\t1\n" +
+ " 寮傚父浜ゆ帴鐝璡t0\t1\n" +
+ " 杞藉鐘舵�侀暱鏃堕棿鍋滅暀\t0\t2\n" +
+ " 瓒呴�焅t0\t3\n" +
+ " 鑰佽檸琛╘t0\t5\n" +
+ " 鍔寔鎶ヨ\t1\t0\n" +
+ " 璁惧鐮村潖鎶ヨ\t1\t1\n" +
+ " 鐢熺悊鐤插姵鎶ヨ\t101\t1\n" +
+ " 寮�杞︽墦鐢佃瘽鎶ヨ\t101\t2\n" +
+ " 寮�杞︽娊鐑熸姤璀t101\t3\n" +
+ " 娉ㄦ剰鍔涘垎鏁t101\t4\n" +
+ " 瓒呮椂椹鹃┒\t101\t8\n" +
+ " 椹鹃┒鍛樻娴嬪紓甯�(浜鸿劯涓嶅湪搴撲腑)\t101\t9\n" +
+ " 鏈郴瀹夊叏甯t101\t17\n" +
+ " 鍙屾墜鑴辩鏂瑰悜鐩榎t101\t18\n" +
+ " 椹鹃┒鍛樻娴嬪紓甯�(鏈娴嬪埌椹鹃┒鍛�)\t101\t5\n" +
+ " 鎺㈠ご閬尅\t101\t6\n" +
+ " 涓嶆埓鍙ｇ僵鎶ヨ\t101\t100\n" +
+ " 鍏朵粬\t101\t255\n" +
+ " 璺彛瓒呴�焅t100\t7\n" +
+ " 涓嶇ぜ璁╄浜篭t100\t18\n" +
+ " 琛屼汉闃叉挒\t100\t19\n" +
+ " 杞﹁窛绂昏繃杩慭t100\t3\n" +
+ " 杞﹂亾鍋忕鍙砛t100\t20\n" +
+ " 杞﹂亾鍋忕宸t100\t21\n" +
+ " 鍓嶅悜纰版挒\t100\t1\n" +
+ " 鍏朵粬\t100\t255\n" +
+ " 绱ф�ユ姤璀t-32\t0\n" +
+ " 棰勮\t-32\t1\n" +
+ " 鍗槦瀹氫綅妯″潡鍙戠敓鏁呴殰\t-32\t2\n" +
+ " 鍗槦瀹氫綅澶╃嚎鏈帴鎴栬�呰鍓柇\t-32\t3\n" +
+ " 鍗槦瀹氫綅澶╃嚎鐭矾\t-32\t4\n" +
+ " ISU 涓荤數婧愭瑺鍘媆t-32\t5\n" +
+ " ISU 涓荤數婧愭帀鐢礬t-32\t6\n" +
+ " LCD鏄剧ずISU鏁呴殰\t-32\t7\n" +
+ " 璇煶鍚堟垚妯″潡鏁呴殰\t-32\t8\n" +
+ " 鎽勫儚澶存晠闅淺t-32\t9\n" +
+ " 璁′环鍣ㄦ晠闅淺t-32\t10\n" +
+ " 鏈嶅姟璇勪环鍣ㄦ晠闅淺t-32\t11\n" +
+ " LED骞垮憡灞忓箷鏁呴殰\t-32\t12\n" +
+ " LCD鏄剧ず灞忔晠闅淺t-32\t13\n" +
+ " 瀹夊叏璁块棶妯″潡鏁呴殰\t-32\t14\n" +
+ " LED棰勭伅鏁呴殰\t-32\t15\n" +
+ " 瓒呴�熸姤璀t-32\t16\n" +
+ " 杩炵画椹鹃┒瓒呮椂\t-32\t17\n" +
+ " 褰撳ぉ绱椹鹃┒瓒呮椂\t-32\t18\n" +
+ " 瓒呮椂鍋滆溅\t-32\t19\n" +
+ " 杩涘嚭鍖哄煙/璺嚎\t-32\t20\n" +
+ " 璺琛岄┒鏃堕棿涓嶈冻\t-32\t21\n" +
+ " 绂佽璺琛岄┒\t-32\t22\n" +
+ " 杞﹂�熶紶鎰熷櫒鏁呴殰\t-32\t23\n" +
+ " 杞﹁締闈炴硶鐐圭伀\t-32\t24";
+ String[] tt = t.split("\n");
+ List<String> list= new ArrayList<>();
+ int index = 0;
+ for(String s : tt){
+ String[] ttt =s.split("\t");
+ if(ttt.length<=2){
+ System.err.println(s);
+ continue;
+ }
+ String sss = "type"+index+"("+ index+",\""+ttt[0].replace(" ","")+"\"," + ttt[1]+","+ttt[2]+"),";
+ list.add(sss);
+ index++;
+ }
+ for(String s :list){
+ System.out.println(s);
+ }
+ }
+
+ public enum CarsEventType {
+ type0(0,"閲岀▼",-30,100),
+ type1(1,"瓒呴�熸姤璀�(璁惧鍥存爮)",-30,8),
+ type2(2,"杩涘嚭鍖哄煙/璺嚎鎶ヨ(璁惧鍥存爮)",-30,2),
+ type3(3,"浜鸿劯鑰冨嫟",-30,11),
+ type4(4,"IC鍗¤�冨嫟",-30,11),
+ type5(5,"浜鸿劯姣斿缁撴灉",-30,10),
+ type6(6,"鐗规畩寮傚父鎶ヨ",-30,12),
+ type7(7,"鍓嶅悜纰版挒鎶ヨ",100,1),
+ type8(8,"杞﹂亾鍋忓悜鎶ヨ",100,2),
+ type9(9,"杞﹁窛杩囪繎鎶ヨ",100,3),
+ type10(10,"琛屼汉纰版挒鎶ヨ",100,4),
+ type11(11,"棰戠箒鍙橀亾鎶ヨ",100,5),
+ type12(12,"閬撹矾鏍囪瘑瓒呴檺鎶ヨ",100,6),
+ type13(13,"閬撹矾鏍囧織瓒呴�熸姤璀�",100,16),
+ type14(14,"涓诲姩鎶撴媿浜嬩欢",100,17),
+ type15(15,"杞﹀帰杩囬亾琛屼汉妫�娴�",100,19),
+ type16(16,"杞﹂亾鍋忕鍙�",100,20),
+ type17(17,"杞﹂亾鍋忕宸�",100,21),
+ type18(18,"璺彛鎶ヨ",100,30),
+ type19(19,"瓒呴�熸姤璀�",100,31),
+ type20(20,"鏂戦┈绾胯秴閫�",100,32),
+ type21(21,"鏈ぜ璁╄浜�",100,33),
+ type22(22,"杩濊鍗犻亾琛岄┒",100,34),
+ type23(23,"闂孩鐏�",100,35),
+ type24(24,"鐤插姵椹鹃┒鎶ヨ",101,1),
+ type25(25,"鎺ユ墦鐢佃瘽鎶ヨ",101,2),
+ type26(26,"鎶界儫鎶ヨ",101,3),
+ type27(27,"鍒嗙椹鹃┒鎶ヨ",101,4),
+ type28(28,"椹鹃┒鍛樺紓甯�(鍖呮嫭椹鹃┒鍛樼宀�)",101,5),
+ type29(29,"閬尅",101,6),
+ type30(30,"椹鹃┒鍛樹汉鑴歌韩浠借瘑鍒簨浠�(椹鹃┒鍛樻娴嬪紓甯革紝浜鸿劯涓嶅湪搴撲腑)",101,9),
+ type31(31,"鏈郴瀹夊叏甯�",101,17),
+ type32(32,"鏈郴瀹夊叏甯︽姤璀﹀伐绋嬭溅",101,10),
+ type33(33,"绾㈠闃绘柇澧ㄩ暅",101,11),
+ type34(34,"鍙屾墜鑴辩鏂瑰悜鐩�",101,18),
+ type35(35,"鍗曟墜鑴辩鏂瑰悜鐩�",101,13),
+ type36(36,"鏈埓瀹夊叏甯�",101,14),
+ type37(37,"鑷姩鎶撴媿",101,16),
+ type38(38,"闈炴硶鍏抽棬",101,29),
+ type39(39,"闈炴硶寮�闂�",101,30),
+ type40(40,"鐜╂墜鏈�",101,31),
+ type41(41,"楗厭椹鹃┒",101,32),
+ type42(42,"閱夐厭椹鹃┒",101,33),
+ type43(43,"澶氫汉鑴告姤璀�",101,48),
+ type44(44,"闂溂",101,34),
+ type45(45,"鍓岮EB鎶ヨ",101,101),
+ type46(46,"涓嶆埓鍙ｇ僵鎶ヨ",101,100),
+ type47(47,"鍚庢柟鎺ヨ繎鎶ヨ",102,1),
+ type48(48,"宸︿晶鍚庢柟鎺ヨ繎鎶ヨ",102,2),
+ type49(49,"鍙充晶鍚庢柟鎺ヨ繎鎶ヨ",102,3),
+ type50(50,"鍓嶅悜鎺ヨ繎鎶ヨ",102,4),
+ type51(51,"鐤戜技闈炴硶娉ㄦ按鎶ヨ",102,5),
+ type52(52,"鍓嶈秴澹版尝鎶ヨ",102,238),
+ type53(53,"鍚庤秴澹版尝鎶ヨ",102,239),
+ type54(54,"绱ф�ユ姤璀�",102,240),
+ type55(55,"鎬ュ姞閫�",104,1),
+ type56(56,"鎬ュ噺閫�",104,2),
+ type57(57,"纰版挒",104,3),
+ type58(58,"渚х炕",104,4),
+ type59(59,"鎬ュ乏杞集",104,5),
+ type60(60,"鎬ュ彸杞集",104,6),
+ type61(61,"鎬ヨ浆寮�(涓嶅尯鍒嗗乏鍜屽彸)",104,7),
+ type62(62,"鍓х儓棰犵案",104,255),
+ type63(63,"椹鹃┒鍛樿瘉浠�",163,163),
+ type64(64,"鍙宠浆寮秴閫�",238,1),
+ type65(65,"鍙宠浆寮笉鍋滆溅",238,2),
+ type66(66,"涓惧崌浜嬩欢",172,1),
+ type67(67,"瀵嗛棴浜嬩欢",172,2),
+ type68(68,"杞介噸浜嬩欢",172,3),
+ type69(69,"鍓嶈鐩插尯鍒跺姩",249 ,1),
+ type70(70,"鍚庤鐩插尯鍒跺姩",249,2),
+ type71(71,"鍓嶈秴澹版尝鍒跺姩",249,3),
+ type72(72,"鍚庤秴澹版尝鍒跺姩",249,4),
+ type73(73,"宸﹁鐩插尯鍒跺姩",249,5),
+ type74(74,"鍙宠鐩插尯鍒跺姩",249,6),
+ type75(75,"鍓岮EB鍒跺姩",249,7),
+ type76(76,"鍓嶈鐩插尯棰勮",249,21),
+ type77(77,"鍚庤鐩插尯棰勮",249,22),
+ type78(78,"鍓嶈秴澹版尝棰勮",249,23),
+ type79(79,"鍚庤秴澹版尝棰勮",249,24),
+ type80(80,"宸﹁鐩插尯棰勮",249,25),
+ type81(81,"鍙宠鐩插尯棰勮",249,26),
+ type82(82,"鍓岮EB棰勮",249,27),
+ type83(83,"涓诲姩涓婃姤鎶ヨ浜嬩欢",160,0),
+ type84(84,"宸℃涓婃姤浜嬩欢",160,1),
+ type85(85,"绱ф�ユ姤璀�",25,1),
+ type86(86,"绱ф�ユ姤璀�",-32,0),
+ type87(87,"瓒呴�熸姤璀�",-32,16),
+ type88(88,"鐤插姵椹鹃┒",-32,32),
+ type89(89,"鍗遍櫓棰勮",-32,33),
+ type90(90,"GNSS妯″潡鏁呴殰",-32,2),
+ type91(91,"GNSS澶╃嚎鏈帴鍏�",-32,3),
+ type92(92,"GNSS澶╃嚎鐭矾",-32,4),
+ type93(93,"缁堢涓荤數婧愭瑺鍘�",-32,5),
+ type94(94,"缁堢涓荤數婧愭帀鐢�",-32,6),
+ type95(95,"LCD鎴栬�呮樉绀哄睆鏁呴殰",-32,7),
+ type96(96,"TTS妯″潡鏁呴殰",-32,46),
+ type97(97,"鎽勫儚澶存晠闅�",-32,9),
+ type98(98,"閬撹矾杩愯緭璇両C鍗℃ā鍧楁晠闅�",-32,34),
+ type99(99,"瓒呴�熼璀�",-32,43),
+ type100(100,"鐤插姵椹鹃┒棰勮",-32,35),
+ type101(101,"杩濊琛岄┒鎶ヨ(2019)",-32,45),
+ type102(102,"鑳庡帇(2019)",-32,44),
+ type103(103,"褰撳ぉ绱椹鹃┒瓒呮椂",-32,18),
+ type104(104,"瓒呮椂鍋滆溅",-32,19),
+ type105(105,"杩涘嚭鍖哄煙",-32,20),
+ type106(106,"杩涘嚭璺嚎",-32,20),
+ type107(107,"璺琛岄┒鏃堕棿涓嶈冻/杩囬暱",-32,21),
+ type108(108,"璺嚎鍋忕鎶ヨ",-32,36),
+ type109(109,"杞﹁締VSS鏁呴殰",-32,37),
+ type110(110,"杞﹁締娌归噺寮傚父",-32,38),
+ type111(111,"杞﹁締琚洍",-32,39),
+ type112(112,"杞﹁締闈炴硶鐐圭伀",-32,24),
+ type113(113,"杞﹁締闈炴硶浣嶇Щ",-32,25),
+ type114(114,"纰版挒鎶ヨ",-32,40),
+ type115(115,"渚х炕棰勮",-32,41),
+ type116(116,"浜鸿劯閫氱煡",-30,13),
+ type117(117,"涓婄彮鎵撳崱",-30,14),
+ type118(118,"瀛樺偍鍣ㄦ晠闅滄姤璀�",-30,23),
+ type119(119,"鍙告満鎷斾簡TF鍗�",-30,50),
+ type120(120,"鍓╀綑娌归噺鐧惧垎姣�",-30,102),
+ type121(121,"骞冲潎娌硅��",-30,103),
+ type122(122,"娴锋嫈楂樺害",-30,104),
+ type123(123,"鏁忔劅璇嶄簨浠�",-30,900),
+ type124(124,"杞藉涓嶆墦琛�",-33,0),
+ type125(125,"绌鸿浆閲�",-33,2),
+ type126(126,"鎬ュ姞閫�",104,1),
+ type127(127,"鎬ュ噺閫�",104,2),
+ type128(128,"纰版挒",104,3),
+ type129(129,"渚х炕",104,4),
+ type130(130,"鎬ュ乏杞集",104,5),
+ type131(131,"鎬ュ彸杞集",104,6),
+ type132(132,"杩濊杩愯惀鎶ヨ",-33,1),
+ type133(133,"寮傚父浜ゆ帴鐝�",0,1),
+ type134(134,"杞藉鐘舵�侀暱鏃堕棿鍋滅暀",0,2),
+ type135(135,"瓒呴��",0,3),
+ type136(136,"鑰佽檸琛�",0,5),
+ type137(137,"鍔寔鎶ヨ",1,0),
+ type138(138,"璁惧鐮村潖鎶ヨ",1,1),
+ type139(139,"鐢熺悊鐤插姵鎶ヨ",101,1),
+ type140(140,"寮�杞︽墦鐢佃瘽鎶ヨ",101,2),
+ type141(141,"寮�杞︽娊鐑熸姤璀�",101,3),
+ type142(142,"娉ㄦ剰鍔涘垎鏁�",101,4),
+ type143(143,"瓒呮椂椹鹃┒",101,8),
+ type144(144,"椹鹃┒鍛樻娴嬪紓甯�(浜鸿劯涓嶅湪搴撲腑)",101,9),
+ type145(145,"鏈郴瀹夊叏甯�",101,17),
+ type146(146,"鍙屾墜鑴辩鏂瑰悜鐩�",101,18),
+ type147(147,"椹鹃┒鍛樻娴嬪紓甯�(鏈娴嬪埌椹鹃┒鍛�)",101,5),
+ type148(148,"鎺㈠ご閬尅",101,6),
+ type149(149,"涓嶆埓鍙ｇ僵鎶ヨ",101,100),
+ type150(150,"鍏朵粬",101,255),
+ type151(151,"璺彛瓒呴��",100,7),
+ type152(152,"涓嶇ぜ璁╄浜�",100,18),
+ type153(153,"琛屼汉闃叉挒",100,19),
+ type154(154,"杞﹁窛绂昏繃杩�",100,3),
+ type155(155,"杞﹂亾鍋忕鍙�",100,20),
+ type156(156,"杞﹂亾鍋忕宸�",100,21),
+ type157(157,"鍓嶅悜纰版挒",100,1),
+ type158(158,"鍏朵粬",100,255),
+ type159(159,"绱ф�ユ姤璀�",-32,0),
+ type160(160,"棰勮",-32,1),
+ type161(161,"鍗槦瀹氫綅妯″潡鍙戠敓鏁呴殰",-32,2),
+ type162(162,"鍗槦瀹氫綅澶╃嚎鏈帴鎴栬�呰鍓柇",-32,3),
+ type163(163,"鍗槦瀹氫綅澶╃嚎鐭矾",-32,4),
+ type164(164,"ISU涓荤數婧愭瑺鍘�",-32,5),
+ type165(165,"ISU涓荤數婧愭帀鐢�",-32,6),
+ type166(166,"LCD鏄剧ずISU鏁呴殰",-32,7),
+ type167(167,"璇煶鍚堟垚妯″潡鏁呴殰",-32,8),
+ type168(168,"鎽勫儚澶存晠闅�",-32,9),
+ type169(169,"璁′环鍣ㄦ晠闅�",-32,10),
+ type170(170,"鏈嶅姟璇勪环鍣ㄦ晠闅�",-32,11),
+ type171(171,"LED骞垮憡灞忓箷鏁呴殰",-32,12),
+ type172(172,"LCD鏄剧ず灞忔晠闅�",-32,13),
+ type173(173,"瀹夊叏璁块棶妯″潡鏁呴殰",-32,14),
+ type174(174,"LED棰勭伅鏁呴殰",-32,15),
+ type175(175,"瓒呴�熸姤璀�",-32,16),
+ type176(176,"杩炵画椹鹃┒瓒呮椂",-32,17),
+ type177(177,"褰撳ぉ绱椹鹃┒瓒呮椂",-32,18),
+ type178(178,"瓒呮椂鍋滆溅",-32,19),
+ type179(179,"杩涘嚭鍖哄煙/璺嚎",-32,20),
+ type180(180,"璺琛岄┒鏃堕棿涓嶈冻",-32,21),
+ type181(181,"绂佽璺琛岄┒",-32,22),
+ type182(182,"杞﹂�熶紶鎰熷櫒鏁呴殰",-32,23),
+ type183(183,"杞﹁締闈炴硶鐐圭伀",-32,24),
+ type184(184,"鑳庡帇鎶ヨ",103,null),
+ type185(185,"娴嬫俯鎶ヨ",170,null)
+ ;
+
+ // 鎴愬憳鍙橀噺
+ private int key;
+ private Integer type ;
+ private Integer subType ;
+ private String name;
+ public static String getName(Integer type,Integer subType) {
+ for (CarsEventType c : CarsEventType.values()) {
+ if (Constants.equalsInteger(c.getType(),type) && Constants.equalsInteger(c.getSubType(),subType)) {
+ return c.getName();
+ }
+ }
+ return null;
+ }
+ // 鏋勯�犳柟娉�
+ CarsEventType(int key, String name, Integer type,Integer subType) {
+ this.key = key;
+ this.subType = subType;
+ this.type = type;
+ this.name = name;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public Integer getSubType() {
+ return subType;
+ }
+
+ public void setSubType(Integer subType) {
+ this.subType = subType;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+ }
/**
鍗曠偣鐧诲綍妯″潡鑿滃崟鏍囪瘑锛�
1銆佸畨闃蹭腑蹇冿細afzx
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/cars/request/CarsAlarmListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/cars/request/CarsAlarmListRequest.java
new file mode 100644
index 0000000..a705a1a
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/cars/request/CarsAlarmListRequest.java
@@ -0,0 +1,17 @@
+package com.doumee.core.haikang.model.cars.request;
+
+import lombok.Data;
+
+/**
+ * 璁惧鍒楄〃璇锋眰淇℃伅
+ */
+@Data
+public class CarsAlarmListRequest {
+
+ private Integer pageSize;// 椤甸潰澶у皬 Integer 1000 鍚�
+ private Integer pageNo ;//褰撳墠椤� Integer 1
+
+ private String deviceCode ;//璁惧缁堢鎵嬫満鍙� String 鏃� 鏄�
+ private String startTime ;//寮�濮嬫椂闂磞yyy-MM-dd HH:mm:ss String 鏃� 鏄�
+ private String endTime ;//缁撴潫鏃堕棿yyyy-MM-dd HH:mm:ss String 鏃� 鏄�
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/cars/response/CarsAlarmListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/cars/response/CarsAlarmListResponse.java
new file mode 100644
index 0000000..23502aa
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/cars/response/CarsAlarmListResponse.java
@@ -0,0 +1,70 @@
+package com.doumee.core.haikang.model.cars.response;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.List;
+
+/**
+ * 璁惧鍒楄〃鍗曞厓淇℃伅
+ * @param <T>
+ */
+@Data
+public class CarsAlarmListResponse<T> {
+
+ private String deviceCode;// 璁惧缁堢鎵嬫満鍙� String
+ private String productKey ;//璁惧鎵�灞炲瀷鍙风殑浜у搧瀵嗛挜 String
+ private Integer type ;//鎶ヨ绫诲瀷 Integer
+ private Integer subType ;//鎶ヨ瀛愮被锛堟姤璀︾被鍨嬪拰鎶ヨ瀛愮被鍙‘瀹氬敮涓�鎶ヨ绫诲瀷锛� Integer
+ private Integer level ;//鎶ヨ绾у埆 0x01:1棰勮 0x02:2鎶ヨ Integer
+ private Integer frontCarSpeed ;//鍓嶈溅閫熷害Km/h Integer
+ private Integer frontDistance ;//鍓嶈溅/琛屼汉璺濈 Integer
+ private Integer deviationType ;//鍋忕绫诲瀷 0x01:宸︿晶鍋忕 0x02:鍙充晶鍋忕 Integer
+ private Integer roadSignsType ;//閬撹矾鏍囧織璇嗗埆绫诲瀷 0x01:闄愰�熸爣蹇� 0x02:闄愰珮鏍囧織 0x03:闄愰噸鏍囧織 Integer
+ private Integer roadSignsValue ;//閬撹矾鏍囧織璇嗗埆鏁版嵁 Integer
+ private Integer speed;// 杞﹂�� 鍗曚綅Km/h Integer
+ private Integer altitude;// 娴锋嫈楂樺害 鍗曚綅m Short
+ private Double longitude;// 缁忓害 Double
+ private Double latitude;// 绾害 Double
+ private String time;// YY-MM-DD-hh-mm-ss 锛圙MT+8鏃堕棿锛� String
+ private Integer accState;// acc鐘舵�� Integer
+ private Integer leftTurnState ;//宸﹁浆鍚戠姸鎬侊紝0:鍏抽棴锛�1:鎵撳紑 Integer
+ private Integer rightTurnState;// 鍙宠浆鍚戠姸鎬侊紝0:鍏抽棴锛�1:鎵撳紑 Integer
+ private Integer wiperState;// 闆ㄥ埉鍣ㄧ姸鎬侊紝 0:鍏抽棴锛�1:鎵撳紑 Integer
+ private Integer brakingState;// 鍒跺姩鐘舵�侊紝0:鏈埗鍔紝1:鍒跺姩 Integer
+ private Integer cardState ;//鎻掑崱鐘舵�侊紝0:鏈彃鍗★紝1:宸叉彃鍗� Integer
+ private Integer gpsValid;// 瀹氫綅鐘舵�侊紝0:鏈畾浣嶏紝1:宸插畾浣� Integer
+ private String deviceId;// 缁堢ID String
+ private String alarmSignTime ;//鎶ヨ鏍囪瘑鏃堕棿 String
+ private Integer index ;//搴忓彿 Integer
+ private Integer attachCount;// 闄勪欢涓暟锛岄檮浠舵暟>0鐨勬姤璀︼紝鍙互璋冪敤鈥滄煡璇㈣澶囨姤璀﹂檮浠垛�濇帴鍙ｆ煡璇㈤檮浠朵俊鎭� Integer
+ private String alarmSign ;//鎶ヨ鏍囪瘑鍙� 缁堢ID-鏃堕棿-搴忓彿-闄勪欢鏁伴噺 String
+ private Integer fatigueDegree;// 鐤插姵绋嬪害锛岃寖鍥�1~10銆傛暟鍊艰秺澶ц〃绀虹柌鍔崇▼搴﹁秺涓ラ噸 Integer
+ private String carSign;//杞︾墝棰滆壊涓�0鏃讹紝琛ㄧず杞﹁締 VIN锛涘惁鍒欙紝琛ㄧず鍏畨浜ら�氱鐞嗛儴闂ㄩ鍙戠殑鏈哄姩杞﹀彿鐗� String
+ private Integer areaType;//鍖哄煙銆侀亾璺被鍨� Integer
+ private Integer areaId ;//鍖哄煙銆侀亾璺紪鍙� Integer
+ private Integer efcType;// 杩涘嚭鎶ヨ绫诲瀷(0:杩涘叆鍖哄煙锛�1:绂诲紑鍖哄煙) Integer
+ private String qualificationNumber ;//椹鹃┒鍛樹粠涓氳祫鏍艰瘉鍙� String
+ private Integer chanNo ;//閫昏緫閫氶亾鍙� Integer
+ private String attachInfo ;//鎶ヨ闄勪欢淇℃伅锛宎ttachFlag涓簍rue鏃惰瀛楁鏈夋晥锛岃缁嗗瓧娈佃*琛�2 Object
+ private String efcName ;//鐢靛瓙鍥存爮鍚嶇О String
+ private String efcUuid ;//鐢靛瓙鍥存爮uuid String
+ private Integer limitState ;//鍑哄叆闄愬埗(1:绂佹椹跺叆锛�2锛氱姝㈤┒鍑�:3:璺嚎鍋忕) Integer
+ private String position;// 鎶ヨ浣嶇疆 String
+ private Integer moveState ;//杩愬姩鐘舵�侊紝0锛氬仠姝紝1锛氳椹� Integer
+ private Integer voltage;// 鐢电摱鐢靛帇锛屾斁澶�1000鍊� Integer
+ private Integer temperature;// 璁惧娓╁害锛屾斁澶�1000鍊� Integer
+ private Integer wakeupType ;//璁惧鍞ら啋婧� Integer
+ private Integer Tvistatus ;//鍚庢媺鐩告満褰曞儚鐘舵�� Integer
+ private Integer LTEpower;// 4G妯″潡渚涚數 Integer
+ private Integer LTEstatus;// 4G妯″潡鍦ㄤ綅淇″彿 Integer
+ private Integer parkmode;// 鍋滆溅鐩戞帶妯″紡 Integer
+ private Integer uploadType;// 涓婃姤娑堟伅绫诲瀷 Integer
+ private Integer stayTime ;// 鎶ヨ鏃跺凡缁忓仠鐣欑殑鏃堕暱锛屽垎閽� Integer
+ private Long stayId ;//閫旂粡鐐筰d Long
+
+ private String efcEventInfo;// 鐢靛瓙鍥存爮鎶ヨ璇︽儏淇℃伅 Object
+
+ private String gpsData ;//鎶ヨ瀵瑰簲鐨凣PS淇℃伅 Object
+
+ }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/cars/response/CarsAlarmResultListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/cars/response/CarsAlarmResultListResponse.java
new file mode 100644
index 0000000..aa269bf
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/cars/response/CarsAlarmResultListResponse.java
@@ -0,0 +1,18 @@
+package com.doumee.core.haikang.model.cars.response;
+
+import lombok.Data;
+
+/**
+ * 璁惧鍒楄〃鍗曞厓淇℃伅
+ */
+@Data
+public class CarsAlarmResultListResponse{
+
+ private Integer type ;//鎶ヨ绫诲瀷 Integer
+ private Integer subType ;//鎶ヨ瀛愮被锛堟姤璀︾被鍨嬪拰鎶ヨ瀛愮被鍙‘瀹氬敮涓�鎶ヨ绫诲瀷锛� Integer
+ private String time;// YY-MM-DD-hh-mm-ss 锛圙MT+8鏃堕棿锛� String
+ private String carCode;//杞︾墝鍙�
+ private String title;//绫诲瀷鍚嶇О
+ private long timeStamp;
+
+ }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/cars/response/CarsEfcEventInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/cars/response/CarsEfcEventInfoResponse.java
new file mode 100644
index 0000000..b09c1fc
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/cars/response/CarsEfcEventInfoResponse.java
@@ -0,0 +1,67 @@
+package com.doumee.core.haikang.model.cars.response;
+
+import lombok.Data;
+
+/**
+ * 璁惧鍒楄〃鍗曞厓淇℃伅
+ * @param <T>
+ */
+@Data
+public class CarsEfcEventInfoResponse<T> {
+
+ private String deviceCode;// 璁惧缁堢鎵嬫満鍙� String
+ private String productKey ;//璁惧鎵�灞炲瀷鍙风殑浜у搧瀵嗛挜 String
+ private Integer type ;//鎶ヨ绫诲瀷 Integer
+ private Integer subType ;//鎶ヨ瀛愮被锛堟姤璀︾被鍨嬪拰鎶ヨ瀛愮被鍙‘瀹氬敮涓�鎶ヨ绫诲瀷锛� Integer
+ private Integer level ;//鎶ヨ绾у埆 0x01:1棰勮 0x02:2鎶ヨ Integer
+ private Integer frontCarSpeed ;//鍓嶈溅閫熷害Km/h Integer
+ private Integer frontDistance ;//鍓嶈溅/琛屼汉璺濈 Integer
+ private Integer deviationType ;//鍋忕绫诲瀷 0x01:宸︿晶鍋忕 0x02:鍙充晶鍋忕 Integer
+ private Integer roadSignsType ;//閬撹矾鏍囧織璇嗗埆绫诲瀷 0x01:闄愰�熸爣蹇� 0x02:闄愰珮鏍囧織 0x03:闄愰噸鏍囧織 Integer
+ private Integer roadSignsValue ;//閬撹矾鏍囧織璇嗗埆鏁版嵁 Integer
+ private Integer speed;// 杞﹂�� 鍗曚綅Km/h Integer
+ private Integer altitude;// 娴锋嫈楂樺害 鍗曚綅m Short
+ private Double longitude;// 缁忓害 Double
+ private Double latitude;// 绾害 Double
+ private String time;// YY-MM-DD-hh-mm-ss 锛圙MT+8鏃堕棿锛� String
+ private Integer accState;// acc鐘舵�� Integer
+ private Integer leftTurnState ;//宸﹁浆鍚戠姸鎬侊紝0:鍏抽棴锛�1:鎵撳紑 Integer
+ private Integer rightTurnState;// 鍙宠浆鍚戠姸鎬侊紝0:鍏抽棴锛�1:鎵撳紑 Integer
+ private Integer wiperState;// 闆ㄥ埉鍣ㄧ姸鎬侊紝 0:鍏抽棴锛�1:鎵撳紑 Integer
+ private Integer brakingState;// 鍒跺姩鐘舵�侊紝0:鏈埗鍔紝1:鍒跺姩 Integer
+ private Integer cardState ;//鎻掑崱鐘舵�侊紝0:鏈彃鍗★紝1:宸叉彃鍗� Integer
+ private Integer gpsValid;// 瀹氫綅鐘舵�侊紝0:鏈畾浣嶏紝1:宸插畾浣� Integer
+ private String deviceId;// 缁堢ID String
+ private String alarmSignTime ;//鎶ヨ鏍囪瘑鏃堕棿 String
+ private Integer index ;//搴忓彿 Integer
+ private Integer attachCount;// 闄勪欢涓暟锛岄檮浠舵暟>0鐨勬姤璀︼紝鍙互璋冪敤鈥滄煡璇㈣澶囨姤璀﹂檮浠垛�濇帴鍙ｆ煡璇㈤檮浠朵俊鎭� Integer
+ private String alarmSign ;//鎶ヨ鏍囪瘑鍙� 缁堢ID-鏃堕棿-搴忓彿-闄勪欢鏁伴噺 String
+ private Integer fatigueDegree;// 鐤插姵绋嬪害锛岃寖鍥�1~10銆傛暟鍊艰秺澶ц〃绀虹柌鍔崇▼搴﹁秺涓ラ噸 Integer
+ private String carSign;//杞︾墝棰滆壊涓�0鏃讹紝琛ㄧず杞﹁締 VIN锛涘惁鍒欙紝琛ㄧず鍏畨浜ら�氱鐞嗛儴闂ㄩ鍙戠殑鏈哄姩杞﹀彿鐗� String
+ private Integer areaType;//鍖哄煙銆侀亾璺被鍨� Integer
+ private Integer areaId ;//鍖哄煙銆侀亾璺紪鍙� Integer
+ private Integer efcType;// 杩涘嚭鎶ヨ绫诲瀷(0:杩涘叆鍖哄煙锛�1:绂诲紑鍖哄煙) Integer
+ private String qualificationNumber ;//椹鹃┒鍛樹粠涓氳祫鏍艰瘉鍙� String
+ private Integer chanNo ;//閫昏緫閫氶亾鍙� Integer
+ private String attachInfo ;//鎶ヨ闄勪欢淇℃伅锛宎ttachFlag涓簍rue鏃惰瀛楁鏈夋晥锛岃缁嗗瓧娈佃*琛�2 Object
+ private String efcName ;//鐢靛瓙鍥存爮鍚嶇О String
+ private String efcUuid ;//鐢靛瓙鍥存爮uuid String
+ private Integer limitState ;//鍑哄叆闄愬埗(1:绂佹椹跺叆锛�2锛氱姝㈤┒鍑�:3:璺嚎鍋忕) Integer
+ private String position;// 鎶ヨ浣嶇疆 String
+ private Integer moveState ;//杩愬姩鐘舵�侊紝0锛氬仠姝紝1锛氳椹� Integer
+ private Integer voltage;// 鐢电摱鐢靛帇锛屾斁澶�1000鍊� Integer
+ private Integer temperature;// 璁惧娓╁害锛屾斁澶�1000鍊� Integer
+ private Integer wakeupType ;//璁惧鍞ら啋婧� Integer
+ private Integer Tvistatus ;//鍚庢媺鐩告満褰曞儚鐘舵�� Integer
+ private Integer LTEpower;// 4G妯″潡渚涚數 Integer
+ private Integer LTEstatus;// 4G妯″潡鍦ㄤ綅淇″彿 Integer
+ private Integer parkmode;// 鍋滆溅鐩戞帶妯″紡 Integer
+ private Integer uploadType;// 涓婃姤娑堟伅绫诲瀷 Integer
+ private Integer stayTime ;// 鎶ヨ鏃跺凡缁忓仠鐣欑殑鏃堕暱锛屽垎閽� Integer
+ private Long stayId ;//閫旂粡鐐筰d Long
+
+ private String efcEventInfo;// 鐢靛瓙鍥存爮鎶ヨ璇︽儏淇℃伅 Object
+
+ private String gpsData ;//鎶ヨ瀵瑰簲鐨凣PS淇℃伅 Object
+
+ }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java
index 648f197..ed95c67 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java
@@ -2,13 +2,13 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
+ import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.cars.BaseCarsPageResponse;
import com.doumee.core.haikang.model.cars.BaseCarsResponse;
+ import com.doumee.core.haikang.model.cars.request.CarsAlarmListRequest;
import com.doumee.core.haikang.model.cars.request.CarsDeviceRequest;
import com.doumee.core.haikang.model.cars.request.CarsGpsRequest;
- import com.doumee.core.haikang.model.cars.response.CarsDeviceDetaisResponse;
- import com.doumee.core.haikang.model.cars.response.CarsDeviceResponse;
- import com.doumee.core.haikang.model.cars.response.CarsGpsResponse;
+ import com.doumee.core.haikang.model.cars.response.*;
import com.doumee.core.haikang.model.param.BaseListPageResponse;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.respose.FindHomeAlarmInfoPageResponse;
@@ -124,6 +124,40 @@
}
return list;
}
+ public static List<CarsAlarmResultListResponse> getAlarmEvemtList(List<CarsDeviceDetaisResponse> detaisResponses , Date date) {
+ List<CarsAlarmResultListResponse> list = new ArrayList<>();
+ if(detaisResponses ==null || detaisResponses.size()==0){
+ return list ;
+ }
+ CarsAlarmListRequest param = new CarsAlarmListRequest();
+ param.setStartTime(DateUtil.getPlusTime2(DateUtil.getStartOfDay(date)));
+ param.setEndTime(DateUtil.getPlusTime2(DateUtil.getEndOfDay(date)));
+ param.setPageNo(1);
+ param.setPageSize(100);
+ for( CarsDeviceDetaisResponse de :detaisResponses ){
+ param.setDeviceCode(de.getTerminalID());
+ BaseCarsPageResponse<CarsAlarmListResponse> data = getAlarmList(param);
+ if(data!=null &&data.getResults()!=null){
+ for(CarsAlarmListResponse model :data.getResults()){
+ CarsAlarmResultListResponse tm = new CarsAlarmResultListResponse();
+ tm.setTime(model.getTime());
+ tm.setCarCode(de.getPlateNum());
+ tm.setType(model.getType());
+ tm.setSubType(model.getSubType());
+ Date tmDate = DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss", tm.getTime() );
+ if(tmDate!=null){
+ tm.setTimeStamp(tmDate.getTime());
+ }
+ tm.setTitle(HKConstants.CarsEventType.getName(tm.getType(),tm.getSubType()));
+ list.add(tm);
+ }
+ }
+ }
+ Collections.sort(list, (o1, o2) -> {
+ return (int) (o1.getTimeStamp() - o2.getTimeStamp()); //鎸夋暟閲忎粠澶у埌灏忔帓搴�
+ });
+ return list;
+ }
private static CarsDeviceDetaisResponse getFromListById(String key, List<CarsDeviceDetaisResponse> list) {
for(CarsDeviceDetaisResponse dd :list){
@@ -220,7 +254,7 @@
String url = BASE_URL + "device/list/";
TreeMap<String, String> BASE_PARAMS = getBaseParams();
if(StringUtils.isNotBlank(param.getProductKey())){
- BASE_PARAMS.put("productKey", "");//璁惧鍨嬪彿绉橀挜
+ BASE_PARAMS.put("productKey", param.getProductKey());//璁惧鍨嬪彿绉橀挜
}
BASE_PARAMS.put("pageSize",Constants.equalsInteger(param.getPageSize(),0)? "100":param.getPageSize().toString());//椤甸潰澶у皬
BASE_PARAMS.put("pageNo", Constants.equalsInteger(param.getPageNo(),0)? "1":param.getPageNo().toString());//褰撳墠椤�
@@ -233,4 +267,25 @@
}
return null;
}
+ public static BaseCarsPageResponse<CarsAlarmListResponse> getAlarmList(CarsAlarmListRequest param) {
+ String url = BASE_URL + "alarm/list/";
+ TreeMap<String, String> BASE_PARAMS = getBaseParams();
+ if(StringUtils.isNotBlank(param.getStartTime())){
+ BASE_PARAMS.put("startTime", param.getStartTime());
+ }
+ if(StringUtils.isNotBlank(param.getEndTime())){
+ BASE_PARAMS.put("endTime", param.getEndTime());
+ }
+ BASE_PARAMS.put("deviceCode", param.getDeviceCode());
+ BASE_PARAMS.put("pageSize",Constants.equalsInteger(param.getPageSize(),0)? "100":param.getPageSize().toString());//椤甸潰澶у皬
+ BASE_PARAMS.put("pageNo", Constants.equalsInteger(param.getPageNo(),0)? "1":param.getPageNo().toString());//褰撳墠椤�
+ String str = sendRequest(url,BASE_PARAMS);
+ TypeReference typeReference =
+ new TypeReference<BaseCarsResponse<BaseCarsPageResponse<CarsAlarmListResponse>>>(){};
+ BaseCarsResponse<BaseCarsPageResponse<CarsAlarmListResponse>> result = JSONObject.parseObject(str, typeReference.getType());
+ if(result!=null && Constants.equalsInteger(result.getStatus(),0)){
+ return result.getData();
+ }
+ return null;
+ }
}
\ No newline at end of file
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java
index 69d1322..ed3a608 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java
@@ -13,8 +13,12 @@
/**
*/
- private String recordDate ;//瀛楃涓� 鐘舵�佽褰曟椂闂�
- private Integer orderStatus ;//瀛楃涓� 璁㈠崟鐘舵�佺爜
private String orderStatusDes ;//瀛楃涓� 璁㈠崟鐘舵�佹弿杩�
+ private String recordDate ;//瀛楃涓� 鐘舵�佽褰曟椂闂�
+ private Integer orderStatus;// 瀛楃涓� 璁㈠崟鐘舵�佺爜
+ private Integer type;// 瀛楃涓� 璁㈠崟鐘舵�佽褰曠被鍨�
+ private String canCelReason;// 瀛楃涓� 鎾ら攢鍘熷洜
+ private String tel ;//瀛楃涓� 鍙风爜
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardCarsListVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardCarsListVO.java
index 8b9b44f..d58fd25 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardCarsListVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardCarsListVO.java
@@ -1,5 +1,6 @@
package com.doumee.dao.web.response.platformReport;
+import com.doumee.core.haikang.model.cars.response.CarsAlarmResultListResponse;
import com.doumee.core.haikang.model.cars.response.CarsDeviceDetaisResponse;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -25,6 +26,7 @@
@ApiModelProperty(value = "绂荤嚎鏁伴噺")
private int offlineNum;
-
+ @ApiModelProperty(value = "鎶ヨ淇℃伅鍒楄〃")
+ List<CarsAlarmResultListResponse> eventList;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 9750228..094a5fd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -5,6 +5,7 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
+import com.doumee.core.haikang.model.cars.response.CarsAlarmResultListResponse;
import com.doumee.core.haikang.model.cars.response.CarsDeviceDetaisResponse;
import com.doumee.core.haikang.model.param.BaseListPageRequest;
import com.doumee.core.haikang.model.param.BaseListPageResponse;
@@ -952,6 +953,7 @@
public BoardCarsListVO platformJobCarsList(){
BoardCarsListVO data = new BoardCarsListVO();
List<CarsDeviceDetaisResponse> detaisResponses = HKCarOpenService.getAllCarsDetais();
+ List<CarsAlarmResultListResponse> eventList = HKCarOpenService.getAlarmEvemtList(detaisResponses,new Date());
data.setCarsList(detaisResponses);
if(data.getCarsList()!=null && data.getCarsList().size()>0){
List<String> codes = new ArrayList<>();
@@ -959,7 +961,7 @@
int online = 0;
for(CarsDeviceDetaisResponse model:detaisResponses){
if(Constants.equalsInteger(model.getStatus(),Constants.ONE) ||Constants.equalsInteger(model.getStatus(),Constants.TWO)){
- //濡傛灉鏄湪绾挎垨鑰呬紤鐪狅紝鏌ヨ鍦ㄩ�旇繕鏄┖闂�
+ //濡傛灉鏄湪绾挎垨鑰呬紤鐪狅紝鏌ヨ鍦ㄩ�旇繕鏄┖闂瞭y
codes.add(model.getPlateNum());
}else
data.setOfflineNum(data.getOfflineNum()+1);
@@ -1219,7 +1221,8 @@
param.setPeriodType("day");
BigDecimal total = new BigDecimal(0);
BaseResponse<EnergyTrendResponse> response = HKService.energyTrend(param);
- if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null&& response.getData().getYvalues()!=null ){
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
+ && response.getData()!=null&& response.getData().getYvalues()!=null ){
for (int i = 0; i < response.getData().getYvalues().get(0).getValue().length; i++) {
total = total.add(new BigDecimal(StringUtils.defaultString( response.getData().getYvalues().get(0).getValue()[i],"0")));
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
index afd5b16..7772152 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
@@ -134,22 +134,24 @@
TmsCircleStatusResultListResponse t = new TmsCircleStatusResultListResponse();
TMSContants.TopStatusLevel tem = TMSContants.TopStatusLevel.ddsc;
if(i == 0){
- tem=TMSContants.TopStatusLevel.ddsc;
+ tem=TMSContants.TopStatusLevel.yrk;
} if(i == 1){
- tem=TMSContants.TopStatusLevel.ydpzz;
+ tem=TMSContants.TopStatusLevel.ydh;
} if(i == 2){
- tem=TMSContants.TopStatusLevel.ckckz;
- } if(i == 3){
tem=TMSContants.TopStatusLevel.clysz;
} if(i == 4){
- tem=TMSContants.TopStatusLevel.ydh;
+ tem=TMSContants.TopStatusLevel.ckckz;
+ } if(i == 3){
+ tem=TMSContants.TopStatusLevel.ydpzz;
} if(i == 5){
- tem=TMSContants.TopStatusLevel.yrk;
+ tem=TMSContants.TopStatusLevel.ddsc;
}
t.setName(tem.getName());
t.setKey(tem.getKey());
t.setSecondList(getSecondCircleStatusList(tem,response.getData()));
- list.add(t);
+ if(t.getSecondList()!=null & t.getSecondList().size()>0){
+ list.add(t);
+ }
}
}
@@ -166,11 +168,11 @@
for(Integer t :statusList){
for(TmsCircleStatusListResponse status :data){
if(Constants.equalsInteger(status.getOrderStatus(),Constants.FOUR)
- && Constants.equalsInteger(status.getOrderStatus(),TMSContants.StatusCode.app)) {
+ && Constants.equalsInteger(status.getType(),TMSContants.StatusCode.app)) {
status.setOrderStatus(TMSContants.ChildStatusLevel.clqdapp.getKey());
}
if(Constants.equalsInteger(status.getOrderStatus(),Constants.FIVE)
- && Constants.equalsInteger(status.getOrderStatus(),TMSContants.StatusCode.app)) {
+ && Constants.equalsInteger(status.getType(),TMSContants.StatusCode.app)) {
status.setOrderStatus(TMSContants.ChildStatusLevel.ddzhd.getKey());
}
if(Constants.equalsInteger(status.getOrderStatus(),t )){
--
Gitblit v1.9.3