修改bug

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

@@ -7,6 +7,8 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStatusEnum;
@@ -42,6 +44,8 @@ import com.yeejoin.amos.boot.module.jcs.biz.service.impl.ESAlertCalledService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import javax.swing.plaf.basic.BasicViewportUI;
+
 /**
  * 警情接警记录
  *
@@ -61,7 +65,8 @@ public class AlertCalledController extends BaseController {
     private ESAlertCalledService eSAlertCalledService;
     @Autowired
     RedisUtils redisUtils;
-
+    @Autowired
+    DataDictionaryServiceImpl dataDictionaryService;
     @Autowired
     OrgUsrServiceImpl iOrgUsrService;
     @Value("${redis.cache.failure.time}")
@@ -163,7 +168,7 @@ public class AlertCalledController extends BaseController {
         /* bug2408 筛选参数解析异常  修改筛选条件方法 修改入参分离筛选条件
         alertStatus 警情状态  alertTypeCode 报警类型code  alertSourceCode 警情来源code
         陈召 2021-08-21 开始*/
-        IPage<AlertCalled> alertCalledIPage = iAlertCalledService.queryForCalledList(page, alertStatus, alertTypeCode, alertSourceCode, callTimeStart, callTimeEnd,sort);
+        IPage<AlertCalled> alertCalledIPage = iAlertCalledService.queryForCalledList(page, alertStatus,alertTypeCode, alertSourceCode, callTimeStart, callTimeEnd,sort);
         /*  bug  2406   接警记录，列表缺少警情状态字段  by litw start*/
         alertCalledIPage.getRecords().stream().forEach(e->{
             if(e.getAlertStatus()) {
@@ -197,7 +202,18 @@ public class AlertCalledController extends BaseController {
     		@RequestBody ESAlertCalledRequestDto alertCalledVo,
             @RequestParam(value = "current") int current,
             @RequestParam(value = "size") int size) throws Exception {
-        return ResponseHelper.buildResponse(eSAlertCalledService.queryByKeys(alertCalledVo, current, size));
+        /*bug 3090 警情填报，相似警情中响应级别错误显示为code 2021-10-13 chenzhao */
+        Page<ESAlertCalledDto> esAlertCalledDtoPage = eSAlertCalledService.queryByKeys(alertCalledVo, current, size);
+        List<ESAlertCalledDto> records = esAlertCalledDtoPage.getRecords();
+
+        for (ESAlertCalledDto record : records) {
+            if (record.getResponseLevelCode() != null){
+                DataDictionary byCode = dataDictionaryService.getByCode(record.getResponseLevelCode(),"XYJBR");
+                record.setResponseLevel(byCode.getName());
+            }
+        }
+        /*bug 3090 警情填报，相似警情中响应级别错误显示为code 2021-10-13 chenzhao */
+        return ResponseHelper.buildResponse(esAlertCalledDtoPage);
     }
 
     /**