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") 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("ååºå®é²è®¾å¤") 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" + " åAEBæ¥è¦\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" + " åAEBå¶å¨\t249\t7\n" + " åè§ç²åºé¢è¦\t249\t21\n" + " åè§ç²åºé¢è¦\t249\t22\n" + " åè¶ å£°æ³¢é¢è¦\t249\t23\n" + " åè¶ å£°æ³¢é¢è¦\t249\t24\n" + " å·¦è§ç²åºé¢è¦\t249\t25\n" + " å³è§ç²åºé¢è¦\t249\t26\n" + " åAEBé¢è¦\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" + " éè·¯è¿è¾è¯IC塿¨¡åæ é\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,"åAEBæ¥è¦",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,"åAEBå¶å¨",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,"åAEBé¢è¦",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,"éè·¯è¿è¾è¯IC塿¨¡åæ é",-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 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 ;//å¼å§æ¶é´yyyy-MM-dd HH:mm:ss String æ æ¯ private String endTime ;//ç»ææ¶é´yyyy-MM-dd HH:mm:ss String æ æ¯ } 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 ï¼GMT+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 ;//æ¥è¦éä»¶ä¿¡æ¯ï¼attachFlag为trueæ¶è¯¥å段ææï¼è¯¦ç»å段è§*表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 ;//éç»ç¹id Long private String efcEventInfo;// çµåå´æ æ¥è¦è¯¦æ ä¿¡æ¯ Object private String gpsData ;//æ¥è¦å¯¹åºçGPSä¿¡æ¯ Object } 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 ï¼GMT+8æ¶é´ï¼ String private String carCode;//车çå· private String title;//ç±»ååç§° private long timeStamp; } 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 ï¼GMT+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 ;//æ¥è¦éä»¶ä¿¡æ¯ï¼attachFlag为trueæ¶è¯¥å段ææï¼è¯¦ç»å段è§*表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 ;//éç»ç¹id Long private String efcEventInfo;// çµåå´æ æ¥è¦è¯¦æ ä¿¡æ¯ Object private String gpsData ;//æ¥è¦å¯¹åºçGPSä¿¡æ¯ Object } 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; } } 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 ;//å符串 å·ç } 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; } 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)){ //妿æ¯å¨çº¿æè ä¼ç ï¼æ¥è¯¢å¨éè¿æ¯ç©ºé² //妿æ¯å¨çº¿æè ä¼ç ï¼æ¥è¯¢å¨éè¿æ¯ç©ºé²ty 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"))); } 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 )){