日常管理-警情填报相似电梯查询

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

@@ -167,8 +167,8 @@ public class AlertCalledController extends BaseController {
 //		Map<String, Object> map =    iAlertCalledService.getAlertInfoList(DateUtils.dateFormat(new Date(),"")+" 00:00:00",
 //				DateUtils.dateFormat(new Date(),"")+" 23:59:59",reginParams.getCompany().getOrgCode(),
 //				reginParams.getUserModel().getUserId());
-				Map<String, Object> map =    iAlertCalledService.getAlertInfoList(DateUtils.dateFormat(new Date(),"")+" 00:00:00",
-				DateUtils.dateFormat(new Date(),"")+" 23:59:59",null,
+				Map<String, Object> map =    iAlertCalledService.getAlertInfoList(DateUtils.stampToDate(System.currentTimeMillis(),"yyyy-MM-dd")+" 00:00:00",
+				DateUtils.stampToDate(System.currentTimeMillis(),"yyyy-MM-dd")+" 23:59:59",null,
 				null);
 		StringBuilder stringBuilder = new StringBuilder();
 		stringBuilder.append(newNumber);
@@ -203,9 +203,11 @@ public class AlertCalledController extends BaseController {
             alarmStatisticsDto.setTodoNum(iAlertCalledService.list(todoNumQueryWrapper).size());
             alarmStatisticsDto.setAllNum(iAlertCalledService.list(allNumQueryWrapper).size());
 
-            Map<String, Object> map =    iAlertCalledService.getAlertInfoList(DateUtils.dateFormat(new Date(),"")+" 00:00:00",
-                    DateUtils.dateFormat(new Date(),"")+" 23:59:59",reginParams.getCompany().getOrgCode(),
-                    reginParams.getUserModel().getUserId());
+
+			Map<String, Object> map =    iAlertCalledService.getAlertInfoList(DateUtils.stampToDate(System.currentTimeMillis(),"yyyy-MM-dd")+" 00:00:00",
+					DateUtils.stampToDate(System.currentTimeMillis(),"yyyy-MM-dd")+" 23:59:59",null,
+					getUserInfo().getUserId());
+
             // 当天接警
             alarmStatisticsDto.setTodayAlarmNum(map.get("calledCount") == null  ? 0 : Integer.valueOf(map.get("calledCount").toString()))   ;
             //当天提交
@@ -220,10 +222,9 @@ public class AlertCalledController extends BaseController {
             Map<String,Integer> recordMap = Maps.newHashMap();
             // 近七天办理数量
             for(int i = 1 ; i < 8; i++) {
-                Map<String, Object> nearlySevenDaysMap   =    iAlertCalledService.getAlertInfoList(
-                        DateUtils.dateFormat(DateUtils.dateAddDays(new Date(), -i),"")+" 00:00:00",
-                        DateUtils.dateFormat(DateUtils.dateAddDays(new Date(), -i),"")+" 23:59:59",reginParams.getCompany().getOrgCode(),
-                        reginParams.getUserModel().getUserId());
+				Map<String, Object> nearlySevenDaysMap =    iAlertCalledService.getAlertInfoList(DateUtils.stampToDate(System.currentTimeMillis(),"yyyy-MM-dd")+" 00:00:00",
+						DateUtils.stampToDate(System.currentTimeMillis(),"yyyy-MM-dd")+" 23:59:59",null,
+						getUserInfo().getUserId());
                 recordMap.put(DateUtils.dateFormat(DateUtils.dateAddDays(new Date(), -i),""),nearlySevenDaysMap.get("calledCount") == null  ? 0 : Integer.valueOf(nearlySevenDaysMap.get("calledCount").toString()));
             }
             alarmStatisticsDto.setNearlySevenDaysNum(recordMap);

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

@@ -190,7 +190,7 @@ public class ESAlertCalledService {
 		}
         //警情类型一致
         BoolQueryBuilder qb4 = QueryBuilders.boolQuery()
-        		.must(QueryBuilders.termQuery("alarmTypeCode.keyword", alertCalled.getAlarmTypeCode()));
+        		.must(QueryBuilders.termQuery("alarmTypeCode", alertCalled.getAlarmTypeCode()));
         boolMust.should(qb4);
         //使用单位名称一致
         if (!ValidationUtil.isEmpty(alertCalled.getUseUnit()))