修改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

@@ -2,13 +2,16 @@ package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
+import com.yeejoin.amos.boot.biz.common.utils.*;
 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;
@@ -30,9 +33,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
-import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.ESAlertCalledDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.ESAlertCalledRequestDto;
@@ -362,9 +362,16 @@ public class AlertCalledController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getAmosId", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "警情填报联系人模糊查询", notes = "警情填报联系人模糊查询")
-    public ResponseModel< List<Map<String,String>>> getContact ( ) {
+    public ResponseModel< Object> getContact ( ) {
 
-        return ResponseHelper.buildResponse(iAlertCalledService.getContactName());
+        if (redisUtils.hasKey(RedisKey.CONTACT_USER)) {
+            Object obj = redisUtils.get(RedisKey.CONTACT_USER);
+            return ResponseHelper.buildResponse(obj);
+        } else {
+            List<Map<String, String>> contactName = iAlertCalledService.getContactName();
+            redisUtils.set(RedisKey.CONTACT_USER , contactName, time);
+            return ResponseHelper.buildResponse(contactName);
+        }
     }
 
     /**

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

@@ -5,6 +5,7 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.KeySiteServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.entity.*;
@@ -810,7 +811,19 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
     /*2304 地址 联系人模糊查询缺失  陈召 2021-09-23 开始*/
     public List<Map<String,String>> getContactName() {
         List<Map<String,String>> firefightersName = firefightersService.getFirefightersName();
+        firefightersName.forEach(r->{
+                    String phone = r.get("phone");
+                    phone = QRCodeUtil.generateQRCode()+"@"+phone;
+                    r.put("phone",phone);
+                }
+        );
         List<Map<String,String>> contactNames = alertCalledMapper.getContactName();
+        contactNames.forEach(r->{
+            String phone = r.get("phone");
+            phone = QRCodeUtil.generateQRCode()+"@"+phone;
+            r.put("phone",phone);
+                }
+        );
         firefightersName.addAll(contactNames);
 
         return firefightersName;