修复电梯查询错误、维保单位导出异常

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/MaintenanceUnitController.java

@@ -329,7 +329,7 @@ public class MaintenanceUnitController extends BaseController {
                             // 此处由于写接口时表数据还未进行整理，所以此处先默认用文字做查询
                             enterpriseInfoQueryWrapper.like(name, "使用单位");
                         } else {
-                            enterpriseInfoQueryWrapper.like(name, "维保单位");
+                            enterpriseInfoQueryWrapper.like(name, "安装改造维修单位");
                         }
                     } else {
                         String fileValue = (String) o;

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

@@ -867,10 +867,31 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
                         Long.valueOf(nearlySevenDaysMap.get("majorAlertCount" + i).toString()));
             }
             alarmStatisticsDto.setNearlySevenDaysNum(recordMap);
+        } else {
+            alarmStatisticsDto.setAllNum(0);
+            alarmStatisticsDto.setFaultRescue(0L);
+            alarmStatisticsDto.setSleepyIncident(0L);
+            alarmStatisticsDto.setSubmitNum(0L);
+            alarmStatisticsDto.setSuggestions(0L);
+            alarmStatisticsDto.setTodayAlarmNum(0L);
+            alarmStatisticsDto.setTodoNum(0);
+            alarmStatisticsDto.setNearlySevenDaysNum(getDate());
         }
         return alarmStatisticsDto;
     }
 
+    private Map<String, Long> getDate() {
+        HashMap<String, Long> map = new LinkedHashMap<>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        for (int i = 7; i > 0; i--) {
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(new Date());
+            calendar.add(Calendar.DAY_OF_MONTH, -i);
+            Date previousDate = calendar.getTime();
+            map.put(sdf.format(previousDate), 0L);
+        }
+        return map;
+    }
     private void resetCounterAndExpire() {
         // 第二天凌晨序列重置 新开始
         rAtomicLong.set(0);

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/ElevatorServiceImpl.java

@@ -498,6 +498,12 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
                     String status = EquimentEnum.getName.get(integer);
                     dto2.put(EQUSTATE, status);
                 }
+                if (!ValidationUtil.isEmpty(dto2.get("ADDRESS"))){
+                    String address = StringUtils.substringAfter(String.valueOf(dto2.get("ADDRESS")), "/");
+                    if (!ObjectUtils.isEmpty(address)){
+                        dto2.put("ADDRESS", address);
+                    }
+                }
                 list.add(dto2);
             }
             totle = response.getInternalResponse().hits().getTotalHits().value;