Commit bf9777b3 authored by suhuiguang's avatar suhuiguang

Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

parents 80f87523 449602bc
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<select id="queryAlertStatusCount" resultType="java.util.Map"> <select id="queryAlertStatusCount" resultType="java.util.Map">
SELECT SELECT
count( 1 ) calledCount, count( 1 ) calledCount,
sum( CASE WHEN father_alert = null THEN 1 ELSE 0 END ) majorAlertCount, sum( CASE WHEN father_alert is null THEN 1 ELSE 0 END ) majorAlertCount,
sum( CASE WHEN alarm_type_code = 'KRJY' THEN 1 ELSE 0 END ) sleepyIncidentCount, sum( CASE WHEN alarm_type_code = 'KRJY' THEN 1 ELSE 0 END ) sleepyIncidentCount,
sum( CASE WHEN alarm_type_code = 'GZWX' THEN 1 ELSE 0 END ) faultRescueCount, sum( CASE WHEN alarm_type_code = 'GZWX' THEN 1 ELSE 0 END ) faultRescueCount,
sum( CASE WHEN alarm_type_code = 'TSZX' THEN 1 ELSE 0 END ) suggestionsCount sum( CASE WHEN alarm_type_code = 'TSZX' THEN 1 ELSE 0 END ) suggestionsCount
......
...@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.tzs.biz.controller; ...@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.tzs.biz.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.SystemClock; import com.baomidou.mybatisplus.core.toolkit.SystemClock;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...@@ -68,7 +67,7 @@ import java.util.stream.Stream; ...@@ -68,7 +67,7 @@ import java.util.stream.Stream;
*/ */
@RestController @RestController
@Api(tags = "警情接警填报记录Api") @Api(tags = "警情接警填报记录Api")
@RequestMapping(value = "/tzs/alert-called") @RequestMapping(value = "/alert-called")
public class AlertCalledController extends BaseController { public class AlertCalledController extends BaseController {
@Autowired @Autowired
...@@ -218,21 +217,21 @@ public class AlertCalledController extends BaseController { ...@@ -218,21 +217,21 @@ public class AlertCalledController extends BaseController {
// 当天接警 // 当天接警
alarmStatisticsDto.setTodayAlarmNum(map.get("calledCount") == null ? 0 : Integer.valueOf(map.get("calledCount").toString())) ; alarmStatisticsDto.setTodayAlarmNum(map.get("calledCount") == null ? 0 : Integer.valueOf(map.get("calledCount").toString())) ;
//当天提交 //当天提交
alarmStatisticsDto.setTodayAlarmNum(map.get("majorAlertCount") == null ? 0 : Integer.valueOf(map.get("majorAlertCount").toString())) ; alarmStatisticsDto.setSubmitNum(map.get("majorAlertCount") == null ? 0 : Integer.valueOf(map.get("majorAlertCount").toString())) ;
//投诉咨询数量 //投诉咨询数量
alarmStatisticsDto.setSuggestions(map.get("suggestionsCount") == null ? 0 : Integer.valueOf(map.get("suggestionsCount").toString())) ; alarmStatisticsDto.setSuggestions(map.get("suggestionsCount") == null ? 0 : Integer.valueOf(map.get("suggestionsCount").toString())) ;
//故障维修数量 //故障维修数量
alarmStatisticsDto.setSuggestions(map.get("faultRescueCount") == null ? 0 : Integer.valueOf(map.get("faultRescueCount").toString())) ; alarmStatisticsDto.setFaultRescue(map.get("faultRescueCount") == null ? 0 : Integer.valueOf(map.get("faultRescueCount").toString())) ;
//困人救援数量 //困人救援数量
alarmStatisticsDto.setSuggestions(map.get("sleepyIncidentCount") == null ? 0 : Integer.valueOf(map.get("sleepyIncidentCount").toString())) ; alarmStatisticsDto.setSleepyIncident(map.get("sleepyIncidentCount") == null ? 0 : Integer.valueOf(map.get("sleepyIncidentCount").toString())) ;
Map<String,Integer> recordMap = Maps.newHashMap(); Map<String,Integer> recordMap = Maps.newHashMap();
// 近七天办理数量 // 近七天办理数量
for(int i = 1 ; i < 8; i++) { for(int i = 1 ; i < 8; i++) {
Map<String, Object> nearlySevenDaysMap = iAlertCalledService.getAlertInfoList(DateUtils.stampToDate(System.currentTimeMillis(),"yyyy-MM-dd")+" 00:00:00", Map<String, Object> nearlySevenDaysMap = iAlertCalledService.getAlertInfoList(DateUtils.stampToDate(DateUtils.dateAddDays(new Date(), -i).getTime(),"yyyy-MM-dd")+" 00:00:00",
DateUtils.stampToDate(System.currentTimeMillis(),"yyyy-MM-dd")+" 23:59:59",null, DateUtils.stampToDate(DateUtils.dateAddDays(new Date(), -i).getTime(),"yyyy-MM-dd")+" 23:59:59",null,
getUserInfo().getUserId()); getUserInfo().getUserId());
recordMap.put(DateUtils.dateFormat(DateUtils.dateAddDays(new Date(), -i),""),nearlySevenDaysMap.get("calledCount") == null ? 0 : Integer.valueOf(nearlySevenDaysMap.get("calledCount").toString())); recordMap.put(DateUtils.stampToDate(DateUtils.dateAddDays(new Date(), -i).getTime(),"yyyy-MM-dd"),nearlySevenDaysMap.get("calledCount") == null ? 0 : Integer.valueOf(nearlySevenDaysMap.get("calledCount").toString()));
} }
alarmStatisticsDto.setNearlySevenDaysNum(recordMap); alarmStatisticsDto.setNearlySevenDaysNum(recordMap);
} }
......
...@@ -34,7 +34,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel; ...@@ -34,7 +34,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
*/ */
@RestController @RestController
@Api(tags = "派遣单Api") @Api(tags = "派遣单Api")
@RequestMapping(value = "/tzs/dispatch-paper") @RequestMapping(value = "/dispatch-paper")
public class DispatchPaperController extends BaseController { public class DispatchPaperController extends BaseController {
@Autowired @Autowired
......
...@@ -34,7 +34,7 @@ import io.swagger.annotations.ApiOperation; ...@@ -34,7 +34,7 @@ import io.swagger.annotations.ApiOperation;
*/ */
@RestController @RestController
@Api(tags = "派遣任务Api") @Api(tags = "派遣任务Api")
@RequestMapping(value = "/tzs/dispatch-task") @RequestMapping(value = "/dispatch-task")
public class DispatchTaskController extends BaseController { public class DispatchTaskController extends BaseController {
@Autowired @Autowired
......
...@@ -35,7 +35,7 @@ import java.util.List; ...@@ -35,7 +35,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Api(tags = "处置过程Api") @Api(tags = "处置过程Api")
@RequestMapping(value = "/tzs/repair-consult") @RequestMapping(value = "/repair-consult")
public class RepairConsultController extends BaseController { public class RepairConsultController extends BaseController {
@Autowired @Autowired
......
...@@ -34,7 +34,7 @@ import io.swagger.annotations.ApiOperation; ...@@ -34,7 +34,7 @@ import io.swagger.annotations.ApiOperation;
*/ */
@RestController @RestController
@Api(tags = "救援过程表Api") @Api(tags = "救援过程表Api")
@RequestMapping(value = "/tzs/rescue-process") @RequestMapping(value = "/rescue-process")
public class RescueProcessController extends BaseController { public class RescueProcessController extends BaseController {
@Autowired @Autowired
......
...@@ -32,7 +32,7 @@ import java.util.List; ...@@ -32,7 +32,7 @@ import java.util.List;
*/ */
@RestController @RestController
@Api(tags = "模板表Api") @Api(tags = "模板表Api")
@RequestMapping(value = "/tzs/template") @RequestMapping(value = "/template")
public class TemplateController extends BaseController { public class TemplateController extends BaseController {
@Autowired @Autowired
......
package com.yeejoin.amos.boot.module.tzs.biz.controller; package com.yeejoin.amos.boot.module.tzs.biz.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils; import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto; import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
...@@ -39,7 +38,7 @@ import java.util.UUID; ...@@ -39,7 +38,7 @@ import java.util.UUID;
*/ */
@RestController @RestController
@Api(tags = "通话记录附件Api") @Api(tags = "通话记录附件Api")
@RequestMapping(value = "/tzs/voice-record-file") @RequestMapping(value = "/voice-record-file")
public class VoiceRecordFileController extends BaseController { public class VoiceRecordFileController extends BaseController {
@Autowired @Autowired
......
...@@ -171,39 +171,39 @@ public class ESAlertCalledService { ...@@ -171,39 +171,39 @@ public class ESAlertCalledService {
long currentTime = System.currentTimeMillis() ; long currentTime = System.currentTimeMillis() ;
currentTime = currentTime - 120*60*1000; currentTime = currentTime - 120*60*1000;
BoolQueryBuilder qb1 = QueryBuilders.boolQuery() BoolQueryBuilder qb1 = QueryBuilders.boolQuery()
.must(QueryBuilders.rangeQuery("callTimeLong").gte(currentTime)); .filter(QueryBuilders.rangeQuery("callTimeLong").gte(currentTime));
boolMust.must(qb1); boolMust.must(qb1);
//报警电话一致 //报警电话一致
if (!ValidationUtil.isEmpty(alertCalled.getEmergencyCall()) && !ValidationUtil.isEmpty(alertCalled.getContactPhone())) if (!ValidationUtil.isEmpty(alertCalled.getEmergencyCall()) && !ValidationUtil.isEmpty(alertCalled.getContactPhone()))
{ {
BoolQueryBuilder qb2 = QueryBuilders.boolQuery() BoolQueryBuilder qb2 = QueryBuilders.boolQuery()
.must(QueryBuilders.termQuery("emergencyCall.keyword", alertCalled.getEmergencyCall())) .should(QueryBuilders.termQuery("emergencyCall.keyword", alertCalled.getEmergencyCall()))
.must(QueryBuilders.termQuery("contactPhone.keyword", alertCalled.getContactPhone())); .should(QueryBuilders.termQuery("contactPhone.keyword", alertCalled.getContactPhone()));
boolMust.should(qb2); boolMust.must(qb2);
} }
//事发地点一致,或相距不超过200米的 //事发地点一致,或相距不超过200米的
if (!ValidationUtil.isEmpty(alertCalled.getAddress())) if (!ValidationUtil.isEmpty(alertCalled.getAddress()))
{ {
BoolQueryBuilder qb3 = QueryBuilders.boolQuery() BoolQueryBuilder qb3 = QueryBuilders.boolQuery()
.should(QueryBuilders.matchQuery("address", alertCalled.getAddress())); .filter(QueryBuilders.matchQuery("address", alertCalled.getAddress()));
boolMust.should(qb3); boolMust.should(qb3);
} }
//警情类型一致 //警情类型一致
BoolQueryBuilder qb4 = QueryBuilders.boolQuery() BoolQueryBuilder qb4 = QueryBuilders.boolQuery()
.must(QueryBuilders.termQuery("alarmTypeCode", alertCalled.getAlarmTypeCode())); .filter(QueryBuilders.termQuery("alarmTypeCode", alertCalled.getAlarmTypeCode()));
boolMust.must(qb4); boolMust.must(qb4);
//使用单位名称一致 //使用单位名称一致
if (!ValidationUtil.isEmpty(alertCalled.getUseUnit())) if (!ValidationUtil.isEmpty(alertCalled.getUseUnit()))
{ {
BoolQueryBuilder qb5 = QueryBuilders.boolQuery() BoolQueryBuilder qb5 = QueryBuilders.boolQuery()
.must(QueryBuilders.termQuery("useUnit.keyword", alertCalled.getUseUnit())); .filter(QueryBuilders.termQuery("useUnit.keyword", alertCalled.getUseUnit()));
boolMust.must(qb5); boolMust.must(qb5);
} }
//电梯识别码一致 //电梯识别码一致
if(!ValidationUtil.isEmpty(alertCalled.getDeviceId())) { if(!ValidationUtil.isEmpty(alertCalled.getDeviceId())) {
BoolQueryBuilder qb6 = QueryBuilders.boolQuery() BoolQueryBuilder qb6 = QueryBuilders.boolQuery()
.must(QueryBuilders.termQuery("deviceId.keyword", alertCalled.getDeviceId())); .filter(QueryBuilders.termQuery("deviceId.keyword", alertCalled.getDeviceId()));
boolMust.should(qb6); boolMust.must(qb6);
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment