2304 地址 联系人模糊查询缺失

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersMapper.java

@@ -34,5 +34,5 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
 
     List<FirefightersExcelDto> exportToExcel(Boolean isDelete);
 
-    List<String> getFirefightersName(String contactName);
+    List<String> getFirefightersName( );
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/KeySiteMapper.java

@@ -36,6 +36,6 @@ public KeySiteDto getSequenceNbr(Long sequenceNbr);
 
 
 public  List<KeySiteDateDto> getKeySiteDate(Long id);
-public List<String> getAddress(String address);
+public List<String> getAddress();
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireTeamMapper.xml

@@ -99,7 +99,7 @@
         a.name ,
         a.contact_user contactUser,
         a.contact_phone contactPhone,
-        ( SELECT count( 1 ) FROM cb_firefighters WHERE fire_team_id = a.sequence_n  br AND is_delete = 0 ) userNum,
+        ( SELECT count( 1 ) FROM cb_firefighters WHERE fire_team_id = a.sequence_nbr AND is_delete = 0 ) userNum,
         Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
         FROM cb_fire_team a
         where  a.is_delete=0 and a.longitude is not null and a.latitude   is not null

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -159,13 +159,14 @@ AND fp.is_delete = 0
 
 	<select id="getFirefightersName" resultType="string">
 		SELECT
-		       a.name
+			cb_firefighters.name
 		FROM
-		     cb_firefighters a
+			cb_firefighters
 		WHERE
-		      a.is_delete =0
-		  and
-		      a.name like concat ('%',#{contactName},'%')
+			cb_firefighters.is_delete = 0 AND
+			cb_firefighters.name IS NOT NULL AND
+			cb_firefighters.name != ''
+		group by cb_firefighters.name
 	</select>
 
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/KeySiteMapper.xml

@@ -138,10 +138,14 @@
 
 	<select id="getAddress" resultType="string">
 		SELECT
-		c.address_desc
-		FROM cb_key_site c
-		where c.is_delete = FALSE
-		and
-		c.address_desc like concat ('%',#{address},'%');
+			cb_key_site.address_desc
+		FROM
+			cb_key_site
+		WHERE
+			cb_key_site.is_delete = FALSE AND
+			cb_key_site.address_desc IS NOT NULL AND
+			cb_key_site.address_desc != ''
+		GROUP BY
+			cb_key_site.address_desc
 	</select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertCalledMapper.java

@@ -36,9 +36,9 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
 
     List<AlertCalledTodyDto> getTodayAlertCalled();
 
-    List<String> getContactName(String contactName);
+    List<String> getContactName( );
 
-    List<String> getAddress(String address);
+    List<String> getAddress();
 
     List<AlertCalled> selectAllPage(Long current, Long size,
                                     Integer alertStatus,

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -190,24 +190,28 @@
 
     <select id="getContactName" resultType="string">
         SELECT
-            a.contact_user
+            jc_alert_called.contact_user
         FROM
-            jc_alert_called a
+            jc_alert_called
         WHERE
-            a.is_delete =0
-          and
-            a.contact_user like concat ('%',#{contactName},'%')
+            jc_alert_called.is_delete = 0 AND
+            jc_alert_called.contact_user IS NOT NULL AND
+            jc_alert_called.contact_user != ''
+        GROUP BY
+            jc_alert_called.contact_user
     </select>
 
     <select id="getAddress" resultType="string">
         SELECT
-            a.address
+            jc_alert_called.address
         FROM
-            jc_alert_called a
+            jc_alert_called
         WHERE
-            a.is_delete =0
-          and
-            a.address like concat ('%',#{address},'%')
+            jc_alert_called.is_delete =0 AND
+            jc_alert_called.address IS NOT NULL AND
+            jc_alert_called.address != ''
+        GROUP BY
+            jc_alert_called.address
     </select>
 
      <!--  未结束警情列表  -->

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java

@@ -103,9 +103,9 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
     }
 
 
-    public List<String> getFirefightersName(String contactName) {
+    public List<String> getFirefightersName( ) {
 
-     return     firefightersMapper.getFirefightersName(contactName);
+     return     firefightersMapper.getFirefightersName();
 
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

@@ -312,7 +312,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 
 
 
-	public List<String> getAddress(String address){
-	 return 	keySiteMapper.getAddress(address);
+	public List<String> getAddress(){
+	 return 	keySiteMapper.getAddress();
 	}
 }

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

@@ -344,9 +344,9 @@ public class AlertCalledController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getAmosId", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "警情填报联系人模糊查询", notes = "警情填报联系人模糊查询")
-    public List<String> getContact (String contactName) {
+    public ResponseModel< List<String>> getContact ( ) {
 
-        return iAlertCalledService.getContactName(contactName);
+        return ResponseHelper.buildResponse(iAlertCalledService.getContactName());
     }
 
     /**
@@ -358,9 +358,9 @@ public class AlertCalledController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getAddress", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "警情填报地址模糊查询", notes = "警情填报地址模糊查询")
-    public List<String> getAddress (String address) {
+    public ResponseModel<List<String>> getAddress () {
 
-        return iAlertCalledService.getCalledAddress(address);
+        return ResponseHelper.buildResponse(iAlertCalledService.getCalledAddress());
     }
     /*2304 地址 联系人模糊查询缺失  陈召 2021-09-23 结束*/
 

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -783,17 +779,19 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
         return resultList;
     }
     /*2304 地址 联系人模糊查询缺失  陈召 2021-09-23 开始*/
-    public List<String> getContactName(String contactName){
-        List<String> firefightersName = firefightersService.getFirefightersName(contactName);
-        List<String> contactNames = alertCalledMapper.getContactName(contactName);
+    public List<String>  getContactName( ){
+        List<String> firefightersName = firefightersService.getFirefightersName();
+        List<String> contactNames = alertCalledMapper.getContactName();
         firefightersName.addAll(contactNames);
+
       return firefightersName;
     }
 
-    public List<String> getCalledAddress(String address){
-        List<String> keyAddress = keySiteService.getAddress(address);
-        List<String> alertAddress = alertCalledMapper.getAddress(address);
+    public  List<String> getCalledAddress( ){
+        List<String> keyAddress = keySiteService.getAddress();
+        List<String> alertAddress = alertCalledMapper.getAddress();
         keyAddress.addAll(alertAddress);
+
         return keyAddress;
     }
     /*2304 地址 联系人模糊查询缺失  陈召 2021-09-23 结束*/