电梯物联信息接口，地图物联信息接口

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/AlertHandlerInfoDto.java

@@ -11,24 +11,24 @@ import lombok.Data;
 public class AlertHandlerInfoDto {
 
     @ApiModelProperty(value = "处置流程")
-    String process;
+    String abProcess;
 
     @ApiModelProperty(value = "接警")
-    String answerThePolice;
+    String acAnswerThePolice;
 
     @ApiModelProperty(value = "上报")
-    String report;
+    String acReport;
 
     @ApiModelProperty(value = "派遣/通知")
-    String notice;
+    String adNotice;
 
     @ApiModelProperty(value = "到达")
-    String arrive;
+    String aedArrive;
 
     @ApiModelProperty(value = "完成")
-    String complete;
+    String afeComplete;
 
     @ApiModelProperty(value = "回访")
-    String returnVisit;
+    String agReturnVisit;
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/ElevatorController.java

@@ -369,7 +369,7 @@ public class ElevatorController extends BaseController {
     public void init() {
         IPage<Elevator> elevatorPage = new Page<>();
         Integer count =  elevatorService.count();
-        for(int i = 0; i <= 2 ; i ++ ) {
+        for(int i = 0; i <= 3 ; i ++ ) {
             elevatorPage.setCurrent(i);
             elevatorPage.setSize(500);
             elevatorPage =  elevatorService.page(elevatorPage);

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/AlertCalledServiceImpl.java

@@ -46,6 +46,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -263,16 +264,16 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
     @Override
     public AlertHandlerDto getHandlerInfo(String alertId) {
         AlertHandlerDto alertHandlerDto = new AlertHandlerDto();
-        Map<String,Date> map = new HashMap<>();
+        LinkedHashMap<String,Date> map = new LinkedHashMap<>();
         List<AlertHandlerInfoDto> list = new ArrayList<>();
         AlertHandlerInfoDto alertHandlerInfoDtoHead = new AlertHandlerInfoDto();
-        alertHandlerInfoDtoHead.setProcess("处置流程");
-        alertHandlerInfoDtoHead.setAnswerThePolice("接警");
-        alertHandlerInfoDtoHead.setReport("上报");
-        alertHandlerInfoDtoHead.setNotice("派遣/通知");
-        alertHandlerInfoDtoHead.setArrive("到达");
-        alertHandlerInfoDtoHead.setComplete("完成");
-        alertHandlerInfoDtoHead.setReturnVisit("回访");
+        alertHandlerInfoDtoHead.setAbProcess("处置流程");
+        alertHandlerInfoDtoHead.setAcAnswerThePolice("接警");
+        alertHandlerInfoDtoHead.setAcReport("上报");
+        alertHandlerInfoDtoHead.setAdNotice("派遣/通知");
+        alertHandlerInfoDtoHead.setAedArrive("到达");
+        alertHandlerInfoDtoHead.setAfeComplete("完成");
+        alertHandlerInfoDtoHead.setAgReturnVisit("回访");
         list.add(alertHandlerInfoDtoHead);
 
         AlertCalled called = this.getById(Long.valueOf(alertId));
@@ -280,8 +281,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         if(null == called) {
             throw new BadRequest("警情不存在");
         }
-        map.put("answerThePolice",called.getCallTime());
-        map.put("report",called.getRecDate());
+        map.put("acAnswerThePolice",called.getCallTime());
+        map.put("acReport",called.getRecDate());
 
         LambdaQueryWrapper<DispatchPaper> queryWrapper = new LambdaQueryWrapper();
         queryWrapper.eq(DispatchPaper::getAlertId,Long.valueOf(alertId));
@@ -300,9 +301,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
                 if(null != dispatchTask &&dispatchTask.size() > 0 ) {
                     List<DispatchTask> taskList =  dispatchTask.stream().filter(e->e.getOrgType().equals(s)).collect(Collectors.toList());
                     if(taskList.size() > 0) {
-                        map.put("notice",called.getRecDate());
-                        map.put("arrive",dispatchTask.get(0).getArriveTime());
-                        map.put("complete",dispatchTask.get(0).getSaveTime());
+                        map.put("adNotice",called.getRecDate());
+                        map.put("aedArrive",dispatchTask.get(0).getArriveTime());
+                        map.put("afeComplete",dispatchTask.get(0).getSaveTime());
                         dataInit(alertHandlerInfoDto,s,"", "","已派遣",
                                 dispatchTask.get(0).getArriveTime() == null ? "" : "已到达" ,dispatchTask.get(0).getSaveTime() == null ? "" : "已完成",
                                 dispatchPaper.getFeedbackTime() != null || dispatchPaper.getFeedbackFinishTime() != null ? "已回访" : "");
@@ -312,7 +313,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
                 }
                 list.add(alertHandlerInfoDto);
             }
-            map.put("returnVisit",dispatchPaper.getFeedbackTime());
+            map.put("agReturnVisit",dispatchPaper.getFeedbackTime());
         } else {
             for(String s:str) {
                 AlertHandlerInfoDto alertHandlerInfoDto = new AlertHandlerInfoDto();
@@ -336,13 +337,13 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
     }
 
     private void dataInit(AlertHandlerInfoDto alertHandlerInfoDto, String process,String answerThePolice, String report, String notice, String arrive, String complete,String returnVisit) {
-        alertHandlerInfoDto.setProcess(process);
-        alertHandlerInfoDto.setAnswerThePolice(answerThePolice);
-        alertHandlerInfoDto.setReport(report);
-        alertHandlerInfoDto.setNotice(notice);
-        alertHandlerInfoDto.setArrive(arrive);
-        alertHandlerInfoDto.setComplete(complete);
-        alertHandlerInfoDto.setReturnVisit(returnVisit);
+        alertHandlerInfoDto.setAbProcess(process);
+        alertHandlerInfoDto.setAcAnswerThePolice(answerThePolice);
+        alertHandlerInfoDto.setAcReport(report);
+        alertHandlerInfoDto.setAdNotice(notice);
+        alertHandlerInfoDto.setAedArrive(arrive);
+        alertHandlerInfoDto.setAfeComplete(complete);
+        alertHandlerInfoDto.setAgReturnVisit(returnVisit);
     }